git-resolve: dying is good, not showing help is bad.

diff --git a/git-commit-script b/git-commit-script
index 24ec446a9d7ed8ad08d25aa6c921eba4c80f0bfe..5c5f564a28e779de333ea96c35c95993f7535869 100755 (executable)
--- a/git-commit-script
+++ b/git-commit-script
@@ -6,10 +6,10 @@
 . git-sh-setup-script || die "Not a git archive"
 
 usage () {
-       die 'git commit [-a]  [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
+       die 'git commit [-a] [-v | --no-verify]  [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
 }
 
-all= logfile= use_commit= no_edit= log_given= log_message=
+all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
 while case "$#" in 0) break;; esac
 do
   case "$1" in
@@ -64,6 +64,15 @@ do
     use_commit="$1"
     no_edit=t
     shift ;;
+  -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
+    signoff=t
+    shift ;;
+  -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
+    verify=
+    shift ;;
+  -v|--v|--ve|--ver|--veri|--verif|--verify)
+    verify=t
+    shift ;;
   --)
     shift
     break ;;
@@ -79,12 +88,27 @@ tt*)
   die "Only one of -c/-C/-F/-m can be used." ;;
 esac
 
-case "$all" in
-t)
+case "$all,$#" in
+t,*)
        git-diff-files --name-only -z |
-       xargs -0 git-update-cache -q -- || exit 1 ;;
+       xargs -0 git-update-cache -q --remove --
+       ;;
+,0)
+       ;;
+*)
+       git-diff-files --name-only -z "$@" |
+       xargs -0 git-update-cache -q --remove --
+       ;;
+esac || exit 1
+git-update-cache -q --refresh || exit 1
+
+case "$verify" in
+t)
+       if test -x "$GIT_DIR"/hooks/pre-commit
+       then
+               "$GIT_DIR"/hooks/pre-commit || exit
+       fi
 esac
-git-update-cache -q --refresh -- "$@" || exit 1
 
 PARENTS="-p HEAD"
 if [ ! -r "$GIT_DIR/HEAD" ]; then
@@ -107,6 +131,7 @@ if [ ! -r "$GIT_DIR/HEAD" ]; then
        no_edit=
 else
        if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
+               {
                echo "#"
                echo "# It looks like your may be committing a MERGE."
                echo "# If this is not correct, please remove the file"
@@ -117,10 +142,13 @@ else
                   no_edit= 
                esac
                echo "#"
+               } |
+               git-stripspace >.editmsg
                PARENTS="-p HEAD -p MERGE_HEAD"
        elif test "$log_message" != ''
        then
-               echo "$log_message"
+               echo "$log_message" |
+               git-stripspace >.editmsg
        elif test "$logfile" != ""
        then
                if test "$logfile" = -
@@ -130,7 +158,8 @@ else
                        cat
                else
                        cat <"$logfile"
-               fi
+               fi |
+               git-stripspace >.editmsg
        elif test "$use_commit" != ""
        then
                pick_author_script='
@@ -160,8 +189,16 @@ else
                export GIT_AUTHOR_EMAIL
                export GIT_AUTHOR_DATE
                git-cat-file commit "$use_commit" |
-               sed -e '1,/^$/d'
-       fi >.editmsg
+               sed -e '1,/^$/d' |
+               git-stripspace >.editmsg
+       fi
+
+       case "$signoff" in
+       t)
+               git-var GIT_COMMITTER_IDENT | sed -e '
+                       s/>.*/>/
+                       s/^/Signed-off-by: /' >>.editmsg ;;
+       esac
        git-status-script >>.editmsg
 fi
 if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
@@ -175,8 +212,18 @@ case "$no_edit" in
        ${VISUAL:-${EDITOR:-vi}} .editmsg
        ;;
 esac
+
+case "$verify" in
+t)
+       if test -x "$GIT_DIR"/hooks/commit-msg
+       then
+               "$GIT_DIR"/hooks/commit-msg .editmsg || exit
+       fi
+esac
+
 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
-if test -s .cmitmsg
+grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk
+if test -s .cmitchk
 then
        tree=$(git-write-tree) &&
        commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
@@ -187,5 +234,10 @@ else
        false
 fi
 ret="$?"
-rm -f .cmitmsg .editmsg
+rm -f .cmitmsg .editmsg .cmitchk
+
+if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
+then
+       "$GIT_DIR"/hooks/post-commit
+fi
 exit "$ret"