Junio C HamanoFrom 11f438cea119c52cc0c982f2b859defb37fd8c64 Mon Sep 17 00:00:00 2001 Move down to no-contains subdirectory inside a subshell, just like the previous step that created and used it does.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
* I noticed this while writing the --sort=version:tag test and failing to find the test vector files I was creating in the test. It turns out that the files I expected was inside a subdirectory because this test piece chdir'ed down and nobody came back up from there.
t/t7004-tag.sh | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-)
Show changes to t/t7004-tag.sh +20 −18
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index d1388cfdf4..ce2ff2a28a 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -2293,24 +2293,26 @@ test_expect_success '--contains combined with --no-contains' ' # don't recurse down to tags for trees or blobs pointed to by *those* # commits. test_expect_success 'Does --[no-]contains stop at commits? Yes!' ' - cd no-contains && - blob=$(git rev-parse v0.3:v0.3.t) && - tree=$(git rev-parse v0.3^{tree}) && - git tag tag-blob $blob && - git tag tag-tree $tree && - git tag --contains v0.3 >actual && - cat >expected <<-\EOF && - v0.3 - v0.4 - v0.5 - EOF - test_cmp expected actual && - git tag --no-contains v0.3 >actual && - cat >expected <<-\EOF && - v0.1 - v0.2 - EOF - test_cmp expected actual + ( + cd no-contains && + blob=$(git rev-parse v0.3:v0.3.t) && + tree=$(git rev-parse v0.3^{tree}) && + git tag tag-blob $blob && + git tag tag-tree $tree && + git tag --contains v0.3 >actual && + cat >expected <<-\EOF && + v0.3 + v0.4 + v0.5 + EOF + test_cmp expected actual && + git tag --no-contains v0.3 >actual && + cat >expected <<-\EOF && + v0.1 + v0.2 + EOF + test_cmp expected actual + ) ' test_expect_success 'If tag is created then tag message file is unlinked' '
-- 2.52.0-rc0