# [PATCH] t1501: fix test with split index 3 messages from 2015-03-24 to 2015-03-24. Participants: Thomas Gummerer, Junio C Hamano. Thread: https://gitlist.dev/t/38906 ## Thomas Gummerer, 2015-03-24 17:35 Subject: [PATCH] t1501: fix test with split index Message-ID: <1427218501-4644-1-git-send-email-t.gummerer@gmail.com> URL: https://gitlist.dev/e/1427218501-4644-1-git-send-email-t.gummerer%40gmail.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. Signed-off-by: Thomas Gummerer --- This applies on top of nd/multiple-work-trees. Sorry for not catching it earlier, but I haven't tried to run the test-suite for the next branch then, where this appears. t/t1501-worktree.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 4df7a2f..ce5c654 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 && + ( cp repo.git/sharedindex.* repo.git/repos/foo 2>/dev/null || : ) && sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE ' -- 2.1.0.264.g0463184.dirty ``` ## Junio C Hamano, 2015-03-24 17:58 Subject: Re: [PATCH] t1501: fix test with split index Message-ID: URL: https://gitlist.dev/e/xmqqa8z26zwi.fsf%40gitster.dls.corp.google.com In-Reply-To: <1427218501-4644-1-git-send-email-t.gummerer@gmail.com> ``` Thomas Gummerer writes: > 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. > > Signed-off-by: Thomas Gummerer > --- > > This applies on top of nd/multiple-work-trees. Sorry for not catching it > earlier, but I haven't tried to run the test-suite for the next branch > then, where this appears. > > t/t1501-worktree.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh > index 4df7a2f..ce5c654 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 && > + ( cp repo.git/sharedindex.* repo.git/repos/foo 2>/dev/null || : ) && 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? > sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE > ' ``` ## Thomas Gummerer, 2015-03-24 19:21 Subject: [PATCH v2] t1501: fix test with split index Message-ID: <1427224900-2206-1-git-send-email-t.gummerer@gmail.com> URL: https://gitlist.dev/e/1427224900-2206-1-git-send-email-t.gummerer%40gmail.com In-Reply-To: ``` 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 Signed-off-by: Thomas Gummerer --- > 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 ```