From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 24 Jan 2013 15:47:03 +0000 (-0200)
Subject: Remove 'config' from args, otherwise it goes to the commit log
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4552017e07e60b11e0cb3e36d43e76524b48851f;p=scripts.git

Remove 'config' from args, otherwise it goes to the commit log
---

diff --git a/commit b/commit
index fc5df31..0bd5613 100755
--- a/commit
+++ b/commit
@@ -87,7 +87,6 @@ function git_push {
 # Check user information
 function git_user {
   if ! grep -q "^\[user\]" $GIT_FOLDER/.git/config; then
-    # TODO: remove '--config' from args, otherwise it goes to the commit log
     if echo $ARGS | grep -q -- '--config'; then
       grep -A 2 "^\[user\]" $HOME/.gitconfig >> $GIT_FOLDER/.git/config
     else
@@ -118,6 +117,13 @@ function git_user {
   fi
 }
 
+# Commit changes
+function git_commit {
+  # Remove '--config' from args, otherwise it goes to the commit log
+  params="echo $* | sed -e 's/--commit//'"
+  git commit -a -m "$params"
+}
+
 # Main
 if [ ! -z "$1" ]; then
   if is_svn .; then
@@ -127,7 +133,7 @@ if [ ! -z "$1" ]; then
   if is_git .; then
     git_folder $(pwd)
     git_user
-    git commit -a -m "$*"
+    git_commit $*
     git_push
   fi
 fi