[PATCH] Assorted changes to glossary

[git.git] / git-commit-script

diff --git a/git-commit-script b/git-commit-script
index 5e6b877..15d0391 100755 (executable)
--- a/git-commit-script
+++ b/git-commit-script
@@ -85,12 +85,19 @@ 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 ;;
-esac
-git-update-cache -q --refresh -- "$@" || exit 1
+       xargs -0 git-update-cache -q --
+       ;;
+,0)
+       ;;
+*)
+       git-diff-files --name-only -z "$@" |
+       xargs -0 git-update-cache -q --
+       ;;
+esac || exit 1
+git-update-cache -q --refresh || exit 1
 
 case "$verify" in
 t)
@@ -167,6 +174,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"
@@ -177,10 +185,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" = -
@@ -190,7 +201,8 @@ else
                        cat
                else
                        cat <"$logfile"
-               fi
+               fi |
+               git-stripspace >.editmsg
        elif test "$use_commit" != ""
        then
                pick_author_script='
@@ -220,9 +232,10 @@ else
                export GIT_AUTHOR_EMAIL
                export GIT_AUTHOR_DATE
                git-cat-file commit "$use_commit" |
-               sed -e '1,/^$/d'
-       fi |
-       git-stripspace >.editmsg
+               sed -e '1,/^$/d' |
+               git-stripspace >.editmsg
+       fi
+
        case "$signoff" in
        t)
                git-var GIT_COMMITTER_IDENT | sed -e '