Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/git-commit.sh b/git-commit.sh
index 7a7a2cb4b47c62d4826aabd9d90a7af26427f980..1c0c6b9e418014cd326d8373f54c38286d2e1239 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -25,7 +25,8 @@ refuse_partial () {
        exit 1
 }
 
-THIS_INDEX="$GIT_DIR/index"
+TMP_INDEX=
+THIS_INDEX="${GIT_INDEX_FILE:-$GIT_DIR/index}"
 NEXT_INDEX="$GIT_DIR/next-index$$"
 rm -f "$NEXT_INDEX"
 save_index () {
@@ -321,9 +322,9 @@ unset only
 case "$all,$interactive,$also,$#" in
 *t,*t,*)
        die "Cannot use -a, --interactive or -i at the same time." ;;
-t,,[1-9]*)
+t,,,[1-9]*)
        die "Paths with -a does not make sense." ;;
-,t,[1-9]*)
+,t,,[1-9]*)
        die "Paths with --interactive does not make sense." ;;
 ,,t,0)
        die "No paths with -i does not make sense." ;;