X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-commit.sh;h=41955e8e64da2d2e04ab4a2890c673a39fc20ffe;hb=4ddba79db76bd6425f00e99ceb1d82d179319aec;hp=5bdee54a46b5012d7d5623040cb4c0eab9d7c7ce;hpb=f51248eb482a7a0feacb04d02119c94d35845975;p=git.git

diff --git a/git-commit.sh b/git-commit.sh
index 5bdee54a..41955e8e 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -6,7 +6,7 @@
 . git-sh-setup || die "Not a git archive"
 
 usage () {
-	die 'git commit [-a] [-v | --no-verify]  [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
+	die 'git commit [-a] [-s] [-v | --no-verify]  [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
 }
 
 all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
@@ -99,7 +99,7 @@ t,*)
 ,0)
 	;;
 *)
-	git-diff-files --name-only -z "$@" |
+	git-diff-files --name-only -z -- "$@" |
 	git-update-index --remove -z --stdin
 	;;
 esac || exit 1
@@ -129,6 +129,9 @@ then
 elif test "$use_commit" != ""
 then
 	git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
+elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
+then
+	cat "$GIT_DIR/MERGE_MSG"
 fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
 
 case "$signoff" in
@@ -144,9 +147,6 @@ t)
 esac
 
 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
-
-	test -f "$GIT_DIR/MERGE_MSG" && cat "$GIT_DIR/MERGE_MSG"
-
 	echo "#"
 	echo "# It looks like your may be committing a MERGE."
 	echo "# If this is not correct, please remove the file"
@@ -184,7 +184,7 @@ then
 		}
 		'
 		set_author_env=`git-cat-file commit "$use_commit" |
-		sed -ne "$pick_author_script"`
+		LANG=C LC_ALL=C sed -ne "$pick_author_script"`
 		eval "$set_author_env"
 		export GIT_AUTHOR_NAME
 		export GIT_AUTHOR_EMAIL