t1501: fix test with split index

tgummerer · gitster · commit 466e8d5d660b · 2015-03-24T12:32:12.000-07:00
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 &lt;gitster@pobox.com&gt;
Signed-off-by: Thomas Gummerer &lt;t.gummerer@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -350,6 +350,7 @@ test_expect_success 'Multi-worktree setup' '`
`350`	`350`	`mkdir work &&`
`351`	`351`	`mkdir -p repo.git/repos/foo &&`
`352`	`352`	`cp repo.git/HEAD repo.git/index repo.git/repos/foo &&`
	`353`	`+ test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&`
`353`	`354`	`sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE`
`354`	`355`	`'`
`355`	`356`