t5001: add tests for export-ignore attributes and exclude pathspecs
Demonstrate mishandling of the attribute export-ignore by git archive when used together with pathspecs. Wildcard pathspecs can even cause it to abort. And a directory excluded without a wildcard is still included as an empty folder in the archive. Test-case-by: David Adam <zanchey@ucc.gu.uwa.edu.au> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Aug 19, 2017 at 07:28 UTC
bed69a6e82bbef99159f9051fd4581cd37c9acf6
1 file changed
+44
-3
t/t5001-archive-attr.sh
+44
-3
@@ -7,11 +7,15 @@ test_description='git archive attribute tests'
7
SUBSTFORMAT='%H (%h)%n'
8
9
test_expect_exists() {
10
- test_expect_success " $1 exists" "test -e $1"
10
+ test_expect_${2:-success} " $1 exists" "test -e $1"
11
}
12
13
test_expect_missing() {
14
- test_expect_success " $1 does not exist" "test ! -e $1"
14
+ test_expect_${2:-success} " $1 does not exist" "test ! -e $1"
15
+}
16
+
17
+extract_tar_to_dir () {
18
+ (mkdir "$1" && cd "$1" && "$TAR" xf -) <"$1.tar"
19
}
20
21
test_expect_success 'setup' '
@@ -21,12 +25,19 @@ test_expect_success 'setup' '
25
26
echo ignored by tree >ignored-by-tree &&
27
echo ignored-by-tree export-ignore >.gitattributes &&
24
- git add ignored-by-tree .gitattributes &&
28
+ mkdir ignored-by-tree.d &&
29
+ >ignored-by-tree.d/file &&
30
+ echo ignored-by-tree.d export-ignore >>.gitattributes &&
31
+ git add ignored-by-tree ignored-by-tree.d .gitattributes &&
32
33
echo ignored by worktree >ignored-by-worktree &&
34
echo ignored-by-worktree export-ignore >.gitattributes &&
35
git add ignored-by-worktree &&
36
37
+ mkdir excluded-by-pathspec.d &&
38
+ >excluded-by-pathspec.d/file &&
39
+ git add excluded-by-pathspec.d &&
40
+
41
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >nosubstfile &&
42
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >substfile1 &&
43
printf "A not substituted O" >substfile2 &&
@@ -46,7 +57,37 @@ test_expect_success 'git archive' '
57
58
test_expect_missing archive/ignored
59
test_expect_missing archive/ignored-by-tree
60
+test_expect_missing archive/ignored-by-tree.d
61
+test_expect_missing archive/ignored-by-tree.d/file
62
test_expect_exists archive/ignored-by-worktree
63
+test_expect_exists archive/excluded-by-pathspec.d
64
+test_expect_exists archive/excluded-by-pathspec.d/file
65
+
66
+test_expect_success 'git archive with pathspec' '
67
+ git archive HEAD ":!excluded-by-pathspec.d" >archive-pathspec.tar &&
68
+ extract_tar_to_dir archive-pathspec
69
+'
70
+
71
+test_expect_missing archive-pathspec/ignored
72
+test_expect_missing archive-pathspec/ignored-by-tree
73
+test_expect_missing archive-pathspec/ignored-by-tree.d
74
+test_expect_missing archive-pathspec/ignored-by-tree.d/file
75
+test_expect_exists archive-pathspec/ignored-by-worktree
76
+test_expect_missing archive-pathspec/excluded-by-pathspec.d failure
77
+test_expect_missing archive-pathspec/excluded-by-pathspec.d/file
78
+
79
+test_expect_failure 'git archive with wildcard pathspec' '
80
+ git archive HEAD ":!excluded-by-p*" >archive-pathspec-wildcard.tar &&
81
+ extract_tar_to_dir archive-pathspec-wildcard
82
+'
83
+
84
+test_expect_missing archive-pathspec-wildcard/ignored
85
+test_expect_missing archive-pathspec-wildcard/ignored-by-tree
86
+test_expect_missing archive-pathspec-wildcard/ignored-by-tree.d
87
+test_expect_missing archive-pathspec-wildcard/ignored-by-tree.d/file
88
+test_expect_exists archive-pathspec-wildcard/ignored-by-worktree failure
89
+test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d
90
+test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d/file
91
92
test_expect_success 'git archive with worktree attributes' '
93
git archive --worktree-attributes HEAD >worktree.tar &&