@matheusbsbs / matheus-bagliano / commits / dbbb8c50f5

t0008: don't rely on default ".git/info/exclude"

Change a test added in 368aa52952d (add git-check-ignore sub-command, 2013-01-06) to clobber .git/info/exclude rather than append to it. These tests would break if the "templates/info--exclude" file added in d3af621b147 (Redo the templates generation and installation., 2005-08-06) wasn't exactly 6 lines (of only comments). Let's instead clobber the default .git/info/excludes file, and test only our own expected content. This is not strictly needed for anything in this series, but is a good cleanup while we're at it. As discussed in the preceding commit a lot of things depend on the "info" directory being created, but this was the only test that relied on the specific content in the "templates/info--exclude" file. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Jun 3, 2022 at 13:15 UTC dbbb8c50f59005c0c1f2fadbf3972ce89e3f9e72
1 file changed +5 -5
t/t0008-ignores.sh
+5 -5
@@ -225,7 +225,7 @@ test_expect_success 'setup' '
225 !globaltwo
226 globalthree
227 EOF
228 - cat <<-\EOF >>.git/info/exclude
228 + cat <<-\EOF >.git/info/exclude
229 per-repo
230 EOF
231 '
@@ -543,9 +543,9 @@ test_expect_success_multi 'submodule from subdirectory' '' '
543
544 test_expect_success 'global ignore not yet enabled' '
545 expect_from_stdin <<-\EOF &&
546 - .git/info/exclude:7:per-repo per-repo
546 + .git/info/exclude:1:per-repo per-repo
547 a/.gitignore:2:*three a/globalthree
548 - .git/info/exclude:7:per-repo a/per-repo
548 + .git/info/exclude:1:per-repo a/per-repo
549 EOF
550 test_check_ignore "-v globalone per-repo a/globalthree a/per-repo not-ignored a/globaltwo"
551 '
@@ -566,10 +566,10 @@ test_expect_success 'global ignore with -v' '
566 enable_global_excludes &&
567 expect_from_stdin <<-EOF &&
568 $global_excludes:1:globalone globalone
569 - .git/info/exclude:7:per-repo per-repo
569 + .git/info/exclude:1:per-repo per-repo
570 $global_excludes:3:globalthree globalthree
571 a/.gitignore:2:*three a/globalthree
572 - .git/info/exclude:7:per-repo a/per-repo
572 + .git/info/exclude:1:per-repo a/per-repo
573 $global_excludes:2:!globaltwo globaltwo
574 EOF
575 test_check_ignore "-v globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo"