X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-commit.sh;h=7e39c107cff93f601c51fec6544a0defe9814db1;hb=ee34518d629331dadd58b1a75294369d679eda8b;hp=41955e8e64da2d2e04ab4a2890c673a39fc20ffe;hpb=e3e291fc07b49b74bb655ca854bdb19e849e044c;p=git.git

diff --git a/git-commit.sh b/git-commit.sh
index 41955e8e..7e39c107 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -3,11 +3,8 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
-. git-sh-setup || die "Not a git archive"
-
-usage () {
-	die 'git commit [-a] [-s] [-v | --no-verify]  [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
-}
+USAGE='[-a] [-s] [-v | --no-verify]  [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
+. git-sh-setup
 
 all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
 while case "$#" in 0) break;; esac
@@ -92,10 +89,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)
 	;;
 *)