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

diff --git a/git-commit.sh b/git-commit.sh
index 5e3908f2cbf5cf96b4f5c3b07d5178b3e2321b58..1c0c6b9e418014cd326d8373f54c38286d2e1239 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -26,7 +26,7 @@ refuse_partial () {
 }
 
 TMP_INDEX=
-THIS_INDEX="$GIT_DIR/index"
+THIS_INDEX="${GIT_INDEX_FILE:-$GIT_DIR/index}"
 NEXT_INDEX="$GIT_DIR/next-index$$"
 rm -f "$NEXT_INDEX"
 save_index () {