Skip to content

Commit

Permalink
t1501: fix test with split index
Browse files Browse the repository at this point in the history
t1501-worktree.sh does not copy the shared index in the "relative
$GIT_WORK_TREE and git subprocesses" test, which makes the test fail
when GIT_TEST_SPLIT_INDEX is set.  Copy the shared index as well in
order to fix this.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
tgummerer authored and gitster committed Mar 24, 2015
1 parent 807e3ca commit 466e8d5
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions t/t1501-worktree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ test_expect_success 'Multi-worktree setup' '
mkdir work &&
mkdir -p repo.git/repos/foo &&
cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&
sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
'

Expand Down

0 comments on commit 466e8d5

Please sign in to comment.