author | Junio C Hamano <gitster@pobox.com> | |
Sun, 25 Nov 2007 02:03:29 +0000 (18:03 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 25 Nov 2007 02:03:29 +0000 (18:03 -0800) |
* rv/maint-index-commit:
Make GIT_INDEX_FILE apply to git-commit
Make GIT_INDEX_FILE apply to git-commit
git-commit.sh | patch | blob | history | |
t/t7500-commit.sh | patch | blob | history |
diff --git a/git-commit.sh b/git-commit.sh
index 5e3908f2cbf5cf96b4f5c3b07d5178b3e2321b58..1c0c6b9e418014cd326d8373f54c38286d2e1239 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
}
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 f11ada8617d95e2c3840ed1ecbdb03745d1f6f2b..26bd8ee469ad5bad5e4e9700c490cb3e3cb73b83 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
commit_msg_is "standard input msg<unknown>"
'
+test_expect_success 'using alternate GIT_INDEX_FILE (1)' '
+
+ cp .git/index saved-index &&
+ (
+ echo some new content >file &&
+ GIT_INDEX_FILE=.git/another_index &&
+ export GIT_INDEX_FILE &&
+ git add file &&
+ git commit -m "commit using another index" &&
+ git diff-index --exit-code HEAD &&
+ git diff-files --exit-code
+ ) &&
+ cmp .git/index saved-index >/dev/null
+
+'
+
+test_expect_success 'using alternate GIT_INDEX_FILE (2)' '
+
+ cp .git/index saved-index &&
+ (
+ rm -f .git/no-such-index &&
+ GIT_INDEX_FILE=.git/no-such-index &&
+ export GIT_INDEX_FILE &&
+ git commit -m "commit using nonexistent index" &&
+ test -z "$(git ls-files)" &&
+ test -z "$(git ls-tree HEAD)"
+
+ ) &&
+ cmp .git/index saved-index >/dev/null
+
+'
+
test_done