t: check that a pattern without trailing slash matches a directory

Prior to v1.8.1.1, with: git init echo content >foo && mkdir subdir && echo content >subdir/bar && echo "subdir export-ignore" >.gitattributes git add . && git commit -m one && git archive HEAD | tar tf - the resulting archive would contain only "foo" and ".gitattributes", not subdir. This was broken with a recent change that intended to allow "subdir/ export-ignore" to also exclude the directory, but instead ended up _requiring_ the trailing slash by mistake. A pattern "subdir" should match any path "subdir", whether it is a directory or a non-directory. A pattern "subdir/" insists that a path "subdir" must be a directory for it to match. This patch adds test not just for this simple case, but also for deeper cross-directory cases, as well as cases with wildcards. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 28, 2013 at 17:50 UTC efa5f82540ac0ea75ac185324a78fa230befa050
1 file changed +27
t/t5002-archive-attr-pattern.sh
+27
@@ -27,6 +27,25 @@ test_expect_success 'setup' '
27 echo ignored-only-if-dir/ export-ignore >>.git/info/attributes &&
28 git add ignored-only-if-dir &&
29
30 + mkdir -p ignored-without-slash &&
31 + echo "ignored without slash" >ignored-without-slash/foo &&
32 + git add ignored-without-slash/foo &&
33 + echo "ignored-without-slash export-ignore" >>.git/info/attributes &&
34 +
35 + mkdir -p wildcard-without-slash &&
36 + echo "ignored without slash" >wildcard-without-slash/foo &&
37 + git add wildcard-without-slash/foo &&
38 + echo "wild*-without-slash export-ignore" >>.git/info/attributes &&
39 +
40 + mkdir -p deep/and/slashless &&
41 + echo "ignored without slash" >deep/and/slashless/foo &&
42 + git add deep/and/slashless/foo &&
43 + echo "deep/and/slashless export-ignore" >>.git/info/attributes &&
44 +
45 + mkdir -p deep/with/wildcard &&
46 + echo "ignored without slash" >deep/with/wildcard/foo &&
47 + git add deep/with/wildcard/foo &&
48 + echo "deep/*t*/wildcard export-ignore" >>.git/info/attributes &&
49
50 mkdir -p one-level-lower/two-levels-lower/ignored-only-if-dir &&
51 echo ignored by ignored dir >one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir &&
@@ -49,6 +68,14 @@ test_expect_exists archive/not-ignored-dir/ignored-only-if-dir
68 test_expect_exists archive/not-ignored-dir/
69 test_expect_missing archive/ignored-only-if-dir/
70 test_expect_missing archive/ignored-ony-if-dir/ignored-by-ignored-dir
71 +test_expect_missing archive/ignored-without-slash/ &&
72 +test_expect_missing archive/ignored-without-slash/foo &&
73 +test_expect_missing archive/wildcard-without-slash/
74 +test_expect_missing archive/wildcard-without-slash/foo &&
75 +test_expect_missing archive/deep/and/slashless/ &&
76 +test_expect_missing archive/deep/and/slashless/foo &&
77 +test_expect_missing archive/deep/with/wildcard/ &&
78 +test_expect_missing archive/deep/with/wildcard/foo &&
79 test_expect_exists archive/one-level-lower/
80 test_expect_missing archive/one-level-lower/two-levels-lower/ignored-only-if-dir/
81 test_expect_missing archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir