]>
Commit | Line | Data |
---|---|---|
78751302 DC |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2011 David Caldwell | |
4 | # | |
5 | ||
6 | test_description='Test git stash --include-untracked' | |
7 | ||
8 | . ./test-lib.sh | |
9 | ||
10 | test_expect_success 'stash save --include-untracked some dirty working directory' ' | |
32b7385e | 11 | echo 1 >file && |
78751302 DC |
12 | git add file && |
13 | test_tick && | |
14 | git commit -m initial && | |
32b7385e | 15 | echo 2 >file && |
78751302 | 16 | git add file && |
32b7385e | 17 | echo 3 >file && |
78751302 | 18 | test_tick && |
32b7385e DL |
19 | echo 1 >file2 && |
20 | echo 1 >HEAD && | |
7474b8b4 BC |
21 | mkdir untracked && |
22 | echo untracked >untracked/untracked && | |
78751302 DC |
23 | git stash --include-untracked && |
24 | git diff-files --quiet && | |
25 | git diff-index --cached --quiet HEAD | |
26 | ' | |
27 | ||
78751302 | 28 | test_expect_success 'stash save --include-untracked cleaned the untracked files' ' |
bbaa45c3 DL |
29 | cat >expect <<-EOF && |
30 | ?? actual | |
31 | ?? expect | |
32 | EOF | |
33 | ||
c995ef49 | 34 | git status --porcelain >actual && |
4fd73124 | 35 | test_cmp expect actual |
78751302 DC |
36 | ' |
37 | ||
78751302 | 38 | test_expect_success 'stash save --include-untracked stashed the untracked files' ' |
389ece40 DL |
39 | one_blob=$(echo 1 | git hash-object --stdin) && |
40 | tracked=$(git rev-parse --short "$one_blob") && | |
41 | untracked_blob=$(echo untracked | git hash-object --stdin) && | |
42 | untracked=$(git rev-parse --short "$untracked_blob") && | |
bbaa45c3 DL |
43 | cat >expect.diff <<-EOF && |
44 | diff --git a/HEAD b/HEAD | |
45 | new file mode 100644 | |
46 | index 0000000..$tracked | |
47 | --- /dev/null | |
48 | +++ b/HEAD | |
49 | @@ -0,0 +1 @@ | |
50 | +1 | |
51 | diff --git a/file2 b/file2 | |
52 | new file mode 100644 | |
53 | index 0000000..$tracked | |
54 | --- /dev/null | |
55 | +++ b/file2 | |
56 | @@ -0,0 +1 @@ | |
57 | +1 | |
58 | diff --git a/untracked/untracked b/untracked/untracked | |
59 | new file mode 100644 | |
60 | index 0000000..$untracked | |
61 | --- /dev/null | |
62 | +++ b/untracked/untracked | |
63 | @@ -0,0 +1 @@ | |
64 | +untracked | |
65 | EOF | |
66 | cat >expect.lstree <<-EOF && | |
67 | HEAD | |
68 | file2 | |
69 | untracked | |
70 | EOF | |
71 | ||
44df2e29 JM |
72 | test_path_is_missing file2 && |
73 | test_path_is_missing untracked && | |
74 | test_path_is_missing HEAD && | |
75 | git diff HEAD stash^3 -- HEAD file2 untracked >actual && | |
4fd73124 BC |
76 | test_cmp expect.diff actual && |
77 | git ls-tree --name-only stash^3: >actual && | |
78 | test_cmp expect.lstree actual | |
78751302 DC |
79 | ' |
80 | test_expect_success 'stash save --patch --include-untracked fails' ' | |
81 | test_must_fail git stash --patch --include-untracked | |
82 | ' | |
83 | ||
84 | test_expect_success 'stash save --patch --all fails' ' | |
85 | test_must_fail git stash --patch --all | |
86 | ' | |
87 | ||
bbaa45c3 DL |
88 | test_expect_success 'clean up untracked/untracked file to prepare for next tests' ' |
89 | git clean --force --quiet | |
78751302 | 90 | |
bbaa45c3 | 91 | ' |
78751302 DC |
92 | |
93 | test_expect_success 'stash pop after save --include-untracked leaves files untracked again' ' | |
bbaa45c3 DL |
94 | cat >expect <<-EOF && |
95 | M file | |
96 | ?? HEAD | |
97 | ?? actual | |
98 | ?? expect | |
99 | ?? file2 | |
100 | ?? untracked/ | |
101 | EOF | |
102 | ||
78751302 | 103 | git stash pop && |
c995ef49 | 104 | git status --porcelain >actual && |
7474b8b4 | 105 | test_cmp expect actual && |
cba12621 EP |
106 | test "1" = "$(cat file2)" && |
107 | test untracked = "$(cat untracked/untracked)" | |
78751302 DC |
108 | ' |
109 | ||
bbaa45c3 DL |
110 | test_expect_success 'clean up untracked/ directory to prepare for next tests' ' |
111 | git clean --force --quiet -d | |
112 | ' | |
78751302 DC |
113 | |
114 | test_expect_success 'stash save -u dirty index' ' | |
32b7385e | 115 | echo 4 >file3 && |
78751302 DC |
116 | git add file3 && |
117 | test_tick && | |
118 | git stash -u | |
119 | ' | |
120 | ||
78751302 | 121 | test_expect_success 'stash save --include-untracked dirty index got stashed' ' |
389ece40 DL |
122 | four_blob=$(echo 4 | git hash-object --stdin) && |
123 | blob=$(git rev-parse --short "$four_blob") && | |
bbaa45c3 DL |
124 | cat >expect <<-EOF && |
125 | diff --git a/file3 b/file3 | |
126 | new file mode 100644 | |
127 | index 0000000..$blob | |
128 | --- /dev/null | |
129 | +++ b/file3 | |
130 | @@ -0,0 +1 @@ | |
131 | +4 | |
132 | EOF | |
133 | ||
78751302 | 134 | git stash pop --index && |
bbaa45c3 | 135 | test_when_finished "git reset" && |
4fd73124 BC |
136 | git diff --cached >actual && |
137 | test_cmp expect actual | |
78751302 DC |
138 | ' |
139 | ||
44df2e29 | 140 | # Must direct output somewhere where it won't be considered an untracked file |
78751302 | 141 | test_expect_success 'stash save --include-untracked -q is quiet' ' |
32b7385e DL |
142 | echo 1 >file5 && |
143 | git stash save --include-untracked --quiet >.git/stash-output.out 2>&1 && | |
44df2e29 JM |
144 | test_line_count = 0 .git/stash-output.out && |
145 | rm -f .git/stash-output.out | |
78751302 DC |
146 | ' |
147 | ||
148 | test_expect_success 'stash save --include-untracked removed files' ' | |
149 | rm -f file && | |
150 | git stash save --include-untracked && | |
32b7385e | 151 | echo 1 >expect && |
bbaa45c3 | 152 | test_when_finished "rm -f expect" && |
dcbaa0b3 | 153 | test_cmp expect file |
78751302 DC |
154 | ' |
155 | ||
78751302 DC |
156 | test_expect_success 'stash save --include-untracked removed files got stashed' ' |
157 | git stash pop && | |
44df2e29 | 158 | test_path_is_missing file |
78751302 DC |
159 | ' |
160 | ||
78751302 | 161 | test_expect_success 'stash save --include-untracked respects .gitignore' ' |
bbaa45c3 DL |
162 | cat >.gitignore <<-EOF && |
163 | .gitignore | |
164 | ignored | |
165 | ignored.d/ | |
166 | EOF | |
167 | ||
32b7385e | 168 | echo ignored >ignored && |
7474b8b4 BC |
169 | mkdir ignored.d && |
170 | echo ignored >ignored.d/untracked && | |
78751302 DC |
171 | git stash -u && |
172 | test -s ignored && | |
7474b8b4 | 173 | test -s ignored.d/untracked && |
78751302 DC |
174 | test -s .gitignore |
175 | ' | |
176 | ||
177 | test_expect_success 'stash save -u can stash with only untracked files different' ' | |
32b7385e | 178 | echo 4 >file4 && |
c995ef49 | 179 | git stash -u && |
44df2e29 | 180 | test_path_is_missing file4 |
78751302 DC |
181 | ' |
182 | ||
183 | test_expect_success 'stash save --all does not respect .gitignore' ' | |
184 | git stash -a && | |
44df2e29 JM |
185 | test_path_is_missing ignored && |
186 | test_path_is_missing ignored.d && | |
187 | test_path_is_missing .gitignore | |
78751302 DC |
188 | ' |
189 | ||
190 | test_expect_success 'stash save --all is stash poppable' ' | |
191 | git stash pop && | |
192 | test -s ignored && | |
7474b8b4 | 193 | test -s ignored.d/untracked && |
78751302 DC |
194 | test -s .gitignore |
195 | ' | |
196 | ||
df6bba09 TG |
197 | test_expect_success 'stash push --include-untracked with pathspec' ' |
198 | >foo && | |
199 | >bar && | |
200 | git stash push --include-untracked -- foo && | |
201 | test_path_is_file bar && | |
202 | test_path_is_missing foo && | |
203 | git stash pop && | |
204 | test_path_is_file bar && | |
205 | test_path_is_file foo | |
206 | ' | |
207 | ||
208 | test_expect_success 'stash push with $IFS character' ' | |
209 | >"foo bar" && | |
210 | >foo && | |
211 | >bar && | |
212 | git add foo* && | |
213 | git stash push --include-untracked -- "foo b*" && | |
214 | test_path_is_missing "foo bar" && | |
215 | test_path_is_file foo && | |
216 | test_path_is_file bar && | |
217 | git stash pop && | |
218 | test_path_is_file "foo bar" && | |
219 | test_path_is_file foo && | |
220 | test_path_is_file bar | |
221 | ' | |
222 | ||
bbffd87d | 223 | test_expect_success 'stash previously ignored file' ' |
bbaa45c3 DL |
224 | cat >.gitignore <<-EOF && |
225 | ignored | |
226 | ignored.d/* | |
227 | EOF | |
228 | ||
bbffd87d NMC |
229 | git reset HEAD && |
230 | git add .gitignore && | |
231 | git commit -m "Add .gitignore" && | |
232 | >ignored.d/foo && | |
32b7385e | 233 | echo "!ignored.d/foo" >>.gitignore && |
bbffd87d NMC |
234 | git stash save --include-untracked && |
235 | test_path_is_missing ignored.d/foo && | |
236 | git stash pop && | |
237 | test_path_is_file ignored.d/foo | |
238 | ' | |
239 | ||
833622a9 TG |
240 | test_expect_success 'stash -u -- <untracked> doesnt print error' ' |
241 | >untracked && | |
242 | git stash push -u -- untracked 2>actual && | |
243 | test_path_is_missing untracked && | |
244 | test_line_count = 0 actual | |
245 | ' | |
246 | ||
247 | test_expect_success 'stash -u -- <untracked> leaves rest of working tree in place' ' | |
248 | >tracked && | |
249 | git add tracked && | |
250 | >untracked && | |
251 | git stash push -u -- untracked && | |
252 | test_path_is_missing untracked && | |
253 | test_path_is_file tracked | |
254 | ' | |
255 | ||
256 | test_expect_success 'stash -u -- <tracked> <untracked> clears changes in both' ' | |
257 | >tracked && | |
258 | git add tracked && | |
259 | >untracked && | |
260 | git stash push -u -- tracked untracked && | |
261 | test_path_is_missing tracked && | |
262 | test_path_is_missing untracked | |
263 | ' | |
264 | ||
265 | test_expect_success 'stash --all -- <ignored> stashes ignored file' ' | |
266 | >ignored.d/bar && | |
267 | git stash push --all -- ignored.d/bar && | |
268 | test_path_is_missing ignored.d/bar | |
269 | ' | |
270 | ||
271 | test_expect_success 'stash --all -- <tracked> <ignored> clears changes in both' ' | |
272 | >tracked && | |
273 | git add tracked && | |
274 | >ignored.d/bar && | |
275 | git stash push --all -- tracked ignored.d/bar && | |
276 | test_path_is_missing tracked && | |
277 | test_path_is_missing ignored.d/bar | |
278 | ' | |
279 | ||
280 | test_expect_success 'stash -u -- <ignored> leaves ignored file alone' ' | |
281 | >ignored.d/bar && | |
282 | git stash push -u -- ignored.d/bar && | |
283 | test_path_is_file ignored.d/bar | |
284 | ' | |
285 | ||
aa74be31 EN |
286 | test_expect_success 'stash -u -- <non-existent> shows no changes when there are none' ' |
287 | git stash push -u -- non-existent >actual && | |
d319bb18 TG |
288 | echo "No local changes to save" >expect && |
289 | test_i18ncmp expect actual | |
290 | ' | |
291 | ||
1366c78c JS |
292 | test_expect_success 'stash -u with globs' ' |
293 | >untracked.txt && | |
294 | git stash -u -- ":(glob)**/*.txt" && | |
295 | test_path_is_missing untracked.txt | |
296 | ' | |
297 | ||
78751302 | 298 | test_done |