X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-commit.sh;h=3d250ec853dad3ff7e714025026ca90f2c77e7bb;hb=6f42f89c1f7030d1101f08bf56d06cc2b6828b83;hp=daf90f1e58242f069e2fde5f44677f60a98e2a0c;hpb=e5215804ded0102f6d6f3d694374ae5e106fd9c0;p=git.git

diff --git a/git-commit.sh b/git-commit.sh
index daf90f1e..3d250ec8 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 usage () {
 	die 'git commit [-a] [-s] [-v | --no-verify]  [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
@@ -92,10 +92,13 @@ tt*)
 esac
 
 case "$all,$#" in
-t,*)
+t,0)
 	git-diff-files --name-only -z |
 	git-update-index --remove -z --stdin
 	;;
+t,*)
+	die "Cannot use -a and explicit files at the same time."
+	;;
 ,0)
 	;;
 *)
@@ -184,7 +187,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