Junio C Hamano <gitster@xxxxxxxxx> writes: > Rémi Vanicat <vanicat@xxxxxxxxxx> writes: > >> @@ -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 () { > > This is just a "purist" question, but I wonder if we want to > differentiate the case where GIT_INDEX_FILE is set to empty and > GIT_INDEX_FILE is not set at all? Well, It's my first patch to git, and I overlook it > So, what I would suggest is: > > * Your "GIT_INDEX_FILE=... git-commit" test -- git-commit > should not fail; > > + Test that the path you modified in the above commit (in this > case, 'file') matches between index you used in the commit > and the resulting commit; > > * Test that the path you modified in the above commit matches > between the HEAD, the alternate index and the work tree (your > latter test). > > + Test that the original index the above wanted to preserve was > not clobbered by git-commit; > > + Test git-commit runs sensibly even when it is given a > nonexistent file as GIT_INDEX_FILE. > > Perhaps like this, instead of your patch to t/t7500: > > 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 > > ' Seem, good, I will use this. -- Rémi Vanicat - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html