From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Nov 2007 22:25:33 +0000 (-0800)
Subject: Merge branch 'rv/maint-index-commit'
X-Git-Tag: v1.5.4-rc0~205
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43f36901c5e4d54de2c3b7c5d62af59382df717c;p=git.git

Merge branch 'rv/maint-index-commit'

* rv/maint-index-commit:
  Make GIT_INDEX_FILE apply to git-commit
---

43f36901c5e4d54de2c3b7c5d62af59382df717c
diff --cc t/t7500-commit.sh
index abbf54ba6,26bd8ee46..cf389b81d
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@@ -90,7 -90,39 +90,39 @@@ test_expect_success 'commit message fro
  	echo "standard input msg" |
  		GIT_EDITOR=../t7500/add-content git commit \
  			--template "$TEMPLATE" --file - &&
 -	commit_msg_is "standard input msg<unknown>"
 +	commit_msg_is "standard input msg"
  '
  
+ 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