mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'rv/maint-index-commit' into maint
* rv/maint-index-commit: Make GIT_INDEX_FILE apply to git-commit
This commit is contained in:
commit
788ea12d43
|
@ -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 () {
|
||||
|
|
|
@ -93,4 +93,36 @@ test_expect_success 'commit message from file should override template' '
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue