summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2015-03-24 20:21:40 +0100
committerJunio C Hamano <gitster@pobox.com>2015-03-24 12:32:12 -0700
commit466e8d5d660ba732c1065ab3329c91e4b4aa7739 (patch)
treef62cacd5cbf8729f1873473956925a9c5cc22e49
parent807e3cac46663481e432c675bd61d37b886c74b2 (diff)
downloadgit-466e8d5d660ba732c1065ab3329c91e4b4aa7739.tar.gz
t1501: fix test with split index
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>
-rwxr-xr-xt/t1501-worktree.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index 4df7a2f212..cc5b870e58 100755
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -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
'