[PATCH v3] Make GIT_INDEX_FILE apply to git-commit

From

Rémi Vanicat <vanicat@debian.org>

Date

Nov 11, 2007, 12:28 UTC

Message-ID

<87r6ixj7af.dlv@vanicat.homelinux.org>

Signed-off-by: Rémi Vanicat <vanicat@debian.org>
---
 git-commit.sh     |    2 +-
 t/t7500-commit.sh |   13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/git-commit.sh b/git-commit.sh
index fcb8443..6490045 100755
--- 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 () {
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index abbf54b..3e5abef 100755
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -93,4 +93,17 @@ test_expect_success 'commit message from file should override template' '
        commit_msg_is "standard input msg"
 '
 
+test_expect_success 'using GIT_INDEX_FILE' '
+
+       echo "some new content" >file &&
+       GIT_INDEX_FILE=.git/another_index git add file &&
+       GIT_INDEX_FILE=.git/another_index \
+               git commit -m "commit using another index" &&
+       git reset HEAD &&
+       git diff HEAD -- file >current &&
+       touch empty-file &&
+       diff empty-file current
+
+'
+
 test_done

-- 
1.5.3.5