[PATCH v2] t1501: fix test with split index
- From
Thomas Gummerer <t.gummerer@gmail.com>
- Date
- Mar 24, 2015, 19:21 UTC
- Message-ID
- <1427224900-2206-1-git-send-email-t.gummerer@gmail.com>
- In-Reply-To
- <xmqqa8z26zwi.fsf@gitster.dls.corp.google.com>
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> ---
Show 5 quoted lines
> Is this a good place to use "test-might-fail", e.g. > > test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo && > > or something?
Yeah that makes sense, thanks.
t/t1501-worktree.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 4df7a2f..cc5b870 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 '
-- 2.1.0.264.g0463184.dirty