@@ -7,11 +7,15 @@ test_description='git archive attribute tests'
7
7
SUBSTFORMAT=' %H (%h)%n'
8
8
9
9
test_expect_exists () {
10
- test_expect_success " $1 exists" " test -e $1 "
10
+ test_expect_ ${2 :- success} " $1 exists" " test -e $1 "
11
11
}
12
12
13
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"
15
19
}
16
20
17
21
test_expect_success ' setup' '
@@ -21,12 +25,19 @@ test_expect_success 'setup' '
21
25
22
26
echo ignored by tree >ignored-by-tree &&
23
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 &&
25
32
26
33
echo ignored by worktree >ignored-by-worktree &&
27
34
echo ignored-by-worktree export-ignore >.gitattributes &&
28
35
git add ignored-by-worktree &&
29
36
37
+ mkdir excluded-by-pathspec.d &&
38
+ >excluded-by-pathspec.d/file &&
39
+ git add excluded-by-pathspec.d &&
40
+
30
41
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >nosubstfile &&
31
42
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >substfile1 &&
32
43
printf "A not substituted O" >substfile2 &&
@@ -46,7 +57,37 @@ test_expect_success 'git archive' '
46
57
47
58
test_expect_missing archive/ignored
48
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
49
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
50
91
51
92
test_expect_success ' git archive with worktree attributes' '
52
93
git archive --worktree-attributes HEAD >worktree.tar &&
0 commit comments