@matheusbsbs / matheus-bagliano / commits / bdbc17e86a

tests: standardize pipe placement

Instead of using a line-continuation and pipe on the second line, take advantage of the shell's implicit line continuation after a pipe character. So for example, instead of some long line \ | next line use some long line | next line And add a blank line before and after the pipe where it aids readability (it usually does). This better matches the coding style documented in Documentation/CodingGuidelines and used in shell scripts elsewhere in the tree. Signed-off-by: Matthew DeVore <matvore@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Matthew DeVore committed Oct 5, 2018 at 14:54 UTC bdbc17e86abe2471c4bd0d52cdc004835cb7bb3e
7 files changed +344 -250
t/lib-gpg.sh
+6 -3
@@ -57,9 +57,12 @@ then
57 echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
58 --passphrase-fd 0 --pinentry-mode loopback \
59 --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
60 - gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
61 - | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
62 - ${GNUPGHOME}/trustlist.txt &&
60 +
61 + gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K |
62 + grep fingerprint: |
63 + cut -d" " -f4 |
64 + tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
65 +
66 echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
67 (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
68 echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
t/t1006-cat-file.sh
+4 -4
@@ -218,8 +218,8 @@ test_expect_success "--batch-check for a non-existent hash" '
218 test "0000000000000000000000000000000000000042 missing
219 0000000000000000000000000000000000000084 missing" = \
220 "$( ( echo 0000000000000000000000000000000000000042;
221 - echo_without_newline 0000000000000000000000000000000000000084; ) \
222 - | git cat-file --batch-check)"
221 + echo_without_newline 0000000000000000000000000000000000000084; ) |
222 + git cat-file --batch-check)"
223 '
224
225 test_expect_success "--batch for an existent and a non-existent hash" '
@@ -227,8 +227,8 @@ test_expect_success "--batch for an existent and a non-existent hash" '
227 $tag_content
228 0000000000000000000000000000000000000000 missing" = \
229 "$( ( echo $tag_sha1;
230 - echo_without_newline 0000000000000000000000000000000000000000; ) \
231 - | git cat-file --batch)"
230 + echo_without_newline 0000000000000000000000000000000000000000; ) |
231 + git cat-file --batch)"
232 '
233
234 test_expect_success "--batch-check for an empty line" '
t/t1300-config.sh
+3 -2
@@ -1770,8 +1770,9 @@ test_expect_success '--show-origin stdin with file include' '
1770 cat >expect <<-EOF &&
1771 file:$INCLUDE_DIR/stdin.include include
1772 EOF
1773 - echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" \
1774 - | git config --show-origin --includes --file - user.stdin >output &&
1773 + echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" |
1774 + git config --show-origin --includes --file - user.stdin >output &&
1775 +
1776 test_cmp expect output
1777 '
1778
t/t5317-pack-objects-filter-objects.sh
+192 -138
@@ -20,17 +20,20 @@ test_expect_success 'setup r1' '
20 '
21
22 test_expect_success 'verify blob count in normal packfile' '
23 - git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
24 - | awk -f print_2.awk \
25 - | sort >expected &&
23 + git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
24 + awk -f print_2.awk |
25 + sort >expected &&
26 +
27 git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
28 HEAD
29 EOF
30 git -C r1 index-pack ../all.pack &&
30 - git -C r1 verify-pack -v ../all.pack \
31 - | grep blob \
32 - | awk -f print_1.awk \
33 - | sort >observed &&
31 +
32 + git -C r1 verify-pack -v ../all.pack |
33 + grep blob |
34 + awk -f print_1.awk |
35 + sort >observed &&
36 +
37 test_cmp observed expected
38 '
39
@@ -39,23 +42,27 @@ test_expect_success 'verify blob:none packfile has no blobs' '
42 HEAD
43 EOF
44 git -C r1 index-pack ../filter.pack &&
42 - git -C r1 verify-pack -v ../filter.pack \
43 - | grep blob \
44 - | awk -f print_1.awk \
45 - | sort >observed &&
45 +
46 + git -C r1 verify-pack -v ../filter.pack |
47 + grep blob |
48 + awk -f print_1.awk |
49 + sort >observed &&
50 +
51 nr=$(wc -l <observed) &&
52 test 0 -eq $nr
53 '
54
55 test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
51 - git -C r1 verify-pack -v ../all.pack \
52 - | grep -E "commit|tree" \
53 - | awk -f print_1.awk \
54 - | sort >expected &&
55 - git -C r1 verify-pack -v ../filter.pack \
56 - | grep -E "commit|tree" \
57 - | awk -f print_1.awk \
58 - | sort >observed &&
56 + git -C r1 verify-pack -v ../all.pack |
57 + grep -E "commit|tree" |
58 + awk -f print_1.awk |
59 + sort >expected &&
60 +
61 + git -C r1 verify-pack -v ../filter.pack |
62 + grep -E "commit|tree" |
63 + awk -f print_1.awk |
64 + sort >observed &&
65 +
66 test_cmp observed expected
67 '
68
@@ -75,17 +82,20 @@ test_expect_success 'setup r2' '
82 '
83
84 test_expect_success 'verify blob count in normal packfile' '
78 - git -C r2 ls-files -s large.1000 large.10000 \
79 - | awk -f print_2.awk \
80 - | sort >expected &&
85 + git -C r2 ls-files -s large.1000 large.10000 |
86 + awk -f print_2.awk |
87 + sort >expected &&
88 +
89 git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
90 HEAD
91 EOF
92 git -C r2 index-pack ../all.pack &&
85 - git -C r2 verify-pack -v ../all.pack \
86 - | grep blob \
87 - | awk -f print_1.awk \
88 - | sort >observed &&
93 +
94 + git -C r2 verify-pack -v ../all.pack |
95 + grep blob |
96 + awk -f print_1.awk |
97 + sort >observed &&
98 +
99 test_cmp observed expected
100 '
101
@@ -94,10 +104,12 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
104 HEAD
105 EOF
106 git -C r2 index-pack ../filter.pack &&
97 - git -C r2 verify-pack -v ../filter.pack \
98 - | grep blob \
99 - | awk -f print_1.awk \
100 - | sort >observed &&
107 +
108 + git -C r2 verify-pack -v ../filter.pack |
109 + grep blob |
110 + awk -f print_1.awk |
111 + sort >observed &&
112 +
113 nr=$(wc -l <observed) &&
114 test 0 -eq $nr
115 '
@@ -107,99 +119,118 @@ test_expect_success 'verify blob:limit=1000' '
119 HEAD
120 EOF
121 git -C r2 index-pack ../filter.pack &&
110 - git -C r2 verify-pack -v ../filter.pack \
111 - | grep blob \
112 - | awk -f print_1.awk \
113 - | sort >observed &&
122 +
123 + git -C r2 verify-pack -v ../filter.pack |
124 + grep blob |
125 + awk -f print_1.awk |
126 + sort >observed &&
127 +
128 nr=$(wc -l <observed) &&
129 test 0 -eq $nr
130 '
131
132 test_expect_success 'verify blob:limit=1001' '
119 - git -C r2 ls-files -s large.1000 \
120 - | awk -f print_2.awk \
121 - | sort >expected &&
133 + git -C r2 ls-files -s large.1000 |
134 + awk -f print_2.awk |
135 + sort >expected &&
136 +
137 git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
138 HEAD
139 EOF
140 git -C r2 index-pack ../filter.pack &&
126 - git -C r2 verify-pack -v ../filter.pack \
127 - | grep blob \
128 - | awk -f print_1.awk \
129 - | sort >observed &&
141 +
142 + git -C r2 verify-pack -v ../filter.pack |
143 + grep blob |
144 + awk -f print_1.awk |
145 + sort >observed &&
146 +
147 test_cmp observed expected
148 '
149
150 test_expect_success 'verify blob:limit=10001' '
134 - git -C r2 ls-files -s large.1000 large.10000 \
135 - | awk -f print_2.awk \
136 - | sort >expected &&
151 + git -C r2 ls-files -s large.1000 large.10000 |
152 + awk -f print_2.awk |
153 + sort >expected &&
154 +
155 git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
156 HEAD
157 EOF
158 git -C r2 index-pack ../filter.pack &&
141 - git -C r2 verify-pack -v ../filter.pack \
142 - | grep blob \
143 - | awk -f print_1.awk \
144 - | sort >observed &&
159 +
160 + git -C r2 verify-pack -v ../filter.pack |
161 + grep blob |
162 + awk -f print_1.awk |
163 + sort >observed &&
164 +
165 test_cmp observed expected
166 '
167
168 test_expect_success 'verify blob:limit=1k' '
149 - git -C r2 ls-files -s large.1000 \
150 - | awk -f print_2.awk \
151 - | sort >expected &&
169 + git -C r2 ls-files -s large.1000 |
170 + awk -f print_2.awk |
171 + sort >expected &&
172 +
173 git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
174 HEAD
175 EOF
176 git -C r2 index-pack ../filter.pack &&
156 - git -C r2 verify-pack -v ../filter.pack \
157 - | grep blob \
158 - | awk -f print_1.awk \
159 - | sort >observed &&
177 +
178 + git -C r2 verify-pack -v ../filter.pack |
179 + grep blob |
180 + awk -f print_1.awk |
181 + sort >observed &&
182 +
183 test_cmp observed expected
184 '
185
186 test_expect_success 'verify explicitly specifying oversized blob in input' '
164 - git -C r2 ls-files -s large.1000 large.10000 \
165 - | awk -f print_2.awk \
166 - | sort >expected &&
187 + git -C r2 ls-files -s large.1000 large.10000 |
188 + awk -f print_2.awk |
189 + sort >expected &&
190 +
191 git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
192 HEAD
193 $(git -C r2 rev-parse HEAD:large.10000)
194 EOF
195 git -C r2 index-pack ../filter.pack &&
172 - git -C r2 verify-pack -v ../filter.pack \
173 - | grep blob \
174 - | awk -f print_1.awk \
175 - | sort >observed &&
196 +
197 + git -C r2 verify-pack -v ../filter.pack |
198 + grep blob |
199 + awk -f print_1.awk |
200 + sort >observed &&
201 +
202 test_cmp observed expected
203 '
204
205 test_expect_success 'verify blob:limit=1m' '
180 - git -C r2 ls-files -s large.1000 large.10000 \
181 - | awk -f print_2.awk \
182 - | sort >expected &&
206 + git -C r2 ls-files -s large.1000 large.10000 |
207 + awk -f print_2.awk |
208 + sort >expected &&
209 +
210 git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
211 HEAD
212 EOF
213 git -C r2 index-pack ../filter.pack &&
187 - git -C r2 verify-pack -v ../filter.pack \
188 - | grep blob \
189 - | awk -f print_1.awk \
190 - | sort >observed &&
214 +
215 + git -C r2 verify-pack -v ../filter.pack |
216 + grep blob |
217 + awk -f print_1.awk |
218 + sort >observed &&
219 +
220 test_cmp observed expected
221 '
222
223 test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
195 - git -C r2 verify-pack -v ../all.pack \
196 - | grep -E "commit|tree" \
197 - | awk -f print_1.awk \
198 - | sort >expected &&
199 - git -C r2 verify-pack -v ../filter.pack \
200 - | grep -E "commit|tree" \
201 - | awk -f print_1.awk \
202 - | sort >observed &&
224 + git -C r2 verify-pack -v ../all.pack |
225 + grep -E "commit|tree" |
226 + awk -f print_1.awk |
227 + sort >expected &&
228 +
229 + git -C r2 verify-pack -v ../filter.pack |
230 + grep -E "commit|tree" |
231 + awk -f print_1.awk |
232 + sort >observed &&
233 +
234 test_cmp observed expected
235 '
236
@@ -224,71 +255,84 @@ test_expect_success 'setup r3' '
255 '
256
257 test_expect_success 'verify blob count in normal packfile' '
227 - git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
228 - | awk -f print_2.awk \
229 - | sort >expected &&
258 + git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
259 + awk -f print_2.awk |
260 + sort >expected &&
261 +
262 git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
263 HEAD
264 EOF
265 git -C r3 index-pack ../all.pack &&
234 - git -C r3 verify-pack -v ../all.pack \
235 - | grep blob \
236 - | awk -f print_1.awk \
237 - | sort >observed &&
266 +
267 + git -C r3 verify-pack -v ../all.pack |
268 + grep blob |
269 + awk -f print_1.awk |
270 + sort >observed &&
271 +
272 test_cmp observed expected
273 '
274
275 test_expect_success 'verify sparse:path=pattern1' '
242 - git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 \
243 - | awk -f print_2.awk \
244 - | sort >expected &&
276 + git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 |
277 + awk -f print_2.awk |
278 + sort >expected &&
279 +
280 git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
281 HEAD
282 EOF
283 git -C r3 index-pack ../filter.pack &&
249 - git -C r3 verify-pack -v ../filter.pack \
250 - | grep blob \
251 - | awk -f print_1.awk \
252 - | sort >observed &&
284 +
285 + git -C r3 verify-pack -v ../filter.pack |
286 + grep blob |
287 + awk -f print_1.awk |
288 + sort >observed &&
289 +
290 test_cmp observed expected
291 '
292
293 test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same commits/trees' '
257 - git -C r3 verify-pack -v ../all.pack \
258 - | grep -E "commit|tree" \
259 - | awk -f print_1.awk \
260 - | sort >expected &&
261 - git -C r3 verify-pack -v ../filter.pack \
262 - | grep -E "commit|tree" \
263 - | awk -f print_1.awk \
264 - | sort >observed &&
294 + git -C r3 verify-pack -v ../all.pack |
295 + grep -E "commit|tree" |
296 + awk -f print_1.awk |
297 + sort >expected &&
298 +
299 + git -C r3 verify-pack -v ../filter.pack |
300 + grep -E "commit|tree" |
301 + awk -f print_1.awk |
302 + sort >observed &&
303 +
304 test_cmp observed expected
305 '
306
307 test_expect_success 'verify sparse:path=pattern2' '
269 - git -C r3 ls-files -s sparse1 dir1/sparse1 \
270 - | awk -f print_2.awk \
271 - | sort >expected &&
308 + git -C r3 ls-files -s sparse1 dir1/sparse1 |
309 + awk -f print_2.awk |
310 + sort >expected &&
311 +
312 git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
313 HEAD
314 EOF
315 git -C r3 index-pack ../filter.pack &&
276 - git -C r3 verify-pack -v ../filter.pack \
277 - | grep blob \
278 - | awk -f print_1.awk \
279 - | sort >observed &&
316 +
317 + git -C r3 verify-pack -v ../filter.pack |
318 + grep blob |
319 + awk -f print_1.awk |
320 + sort >observed &&
321 +
322 test_cmp observed expected
323 '
324
325 test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same commits/trees' '
284 - git -C r3 verify-pack -v ../all.pack \
285 - | grep -E "commit|tree" \
286 - | awk -f print_1.awk \
287 - | sort >expected &&
288 - git -C r3 verify-pack -v ../filter.pack \
289 - | grep -E "commit|tree" \
290 - | awk -f print_1.awk \
291 - | sort >observed &&
326 + git -C r3 verify-pack -v ../all.pack |
327 + grep -E "commit|tree" |
328 + awk -f print_1.awk |
329 + sort >expected &&
330 +
331 + git -C r3 verify-pack -v ../filter.pack |
332 + grep -E "commit|tree" |
333 + awk -f print_1.awk |
334 + sort >observed &&
335 +
336 test_cmp observed expected
337 '
338
@@ -312,48 +356,57 @@ test_expect_success 'setup r4' '
356 '
357
358 test_expect_success 'verify blob count in normal packfile' '
315 - git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
316 - | awk -f print_2.awk \
317 - | sort >expected &&
359 + git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
360 + awk -f print_2.awk |
361 + sort >expected &&
362 +
363 git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
364 HEAD
365 EOF
366 git -C r4 index-pack ../all.pack &&
322 - git -C r4 verify-pack -v ../all.pack \
323 - | grep blob \
324 - | awk -f print_1.awk \
325 - | sort >observed &&
367 +
368 + git -C r4 verify-pack -v ../all.pack |
369 + grep blob |
370 + awk -f print_1.awk |
371 + sort >observed &&
372 +
373 test_cmp observed expected
374 '
375
376 test_expect_success 'verify sparse:oid=OID' '
330 - git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
331 - | awk -f print_2.awk \
332 - | sort >expected &&
377 + git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
378 + awk -f print_2.awk |
379 + sort >expected &&
380 +
381 oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
382 git -C r4 pack-objects --rev --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
383 HEAD
384 EOF
385 git -C r4 index-pack ../filter.pack &&
338 - git -C r4 verify-pack -v ../filter.pack \
339 - | grep blob \
340 - | awk -f print_1.awk \
341 - | sort >observed &&
386 +
387 + git -C r4 verify-pack -v ../filter.pack |
388 + grep blob |
389 + awk -f print_1.awk |
390 + sort >observed &&
391 +
392 test_cmp observed expected
393 '
394
395 test_expect_success 'verify sparse:oid=oid-ish' '
346 - git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
347 - | awk -f print_2.awk \
348 - | sort >expected &&
396 + git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
397 + awk -f print_2.awk |
398 + sort >expected &&
399 +
400 git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
401 HEAD
402 EOF
403 git -C r4 index-pack ../filter.pack &&
353 - git -C r4 verify-pack -v ../filter.pack \
354 - | grep blob \
355 - | awk -f print_1.awk \
356 - | sort >observed &&
404 +
405 + git -C r4 verify-pack -v ../filter.pack |
406 + grep blob |
407 + awk -f print_1.awk |
408 + sort >observed &&
409 +
410 test_cmp observed expected
411 '
412
@@ -361,9 +414,10 @@ test_expect_success 'verify sparse:oid=oid-ish' '
414 # This models previously omitted objects that we did not receive.
415
416 test_expect_success 'setup r1 - delete loose blobs' '
364 - git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
365 - | awk -f print_2.awk \
366 - | sort >expected &&
417 + git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
418 + awk -f print_2.awk |
419 + sort >expected &&
420 +
421 for id in `cat expected | sed "s|..|&/|"`
422 do
423 rm r1/.git/objects/$id
t/t5500-fetch-pack.sh
+5 -2
@@ -50,8 +50,11 @@ pull_to_client () {
50 case "$heads" in *B*)
51 git update-ref refs/heads/B "$BTIP";;
52 esac &&
53 - git symbolic-ref HEAD refs/heads/$(echo $heads \
54 - | sed -e "s/^\(.\).*$/\1/") &&
53 +
54 + git symbolic-ref HEAD refs/heads/$(
55 + echo $heads |
56 + sed -e "s/^\(.\).*$/\1/"
57 + ) &&
58
59 git fsck --full &&
60
t/t5616-partial-clone.sh
+19 -13
@@ -34,10 +34,12 @@ test_expect_success 'setup bare clone for server' '
34 # confirm partial clone was registered in the local config.
35 test_expect_success 'do partial clone 1' '
36 git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
37 - git -C pc1 rev-list HEAD --quiet --objects --missing=print \
38 - | awk -f print_1.awk \
39 - | sed "s/?//" \
40 - | sort >observed.oids &&
37 +
38 + git -C pc1 rev-list HEAD --quiet --objects --missing=print |
39 + awk -f print_1.awk |
40 + sed "s/?//" |
41 + sort >observed.oids &&
42 +
43 test_cmp expect_1.oids observed.oids &&
44 test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
45 test "$(git -C pc1 config --local extensions.partialclone)" = "origin" &&
@@ -130,16 +132,20 @@ test_expect_success 'push new commits to server for file.3.txt' '
132 # perhaps combined with a command in dry-run mode.
133 test_expect_success 'manual prefetch of missing objects' '
134 git -C pc1 fetch --filter=blob:none origin &&
133 - git -C pc1 rev-list master..origin/master --quiet --objects --missing=print \
134 - | awk -f print_1.awk \
135 - | sed "s/?//" \
136 - | sort >observed.oids &&
135 +
136 + git -C pc1 rev-list master..origin/master --quiet --objects --missing=print |
137 + awk -f print_1.awk |
138 + sed "s/?//" |
139 + sort >observed.oids &&
140 +
141 test_line_count = 6 observed.oids &&
142 git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
139 - git -C pc1 rev-list master..origin/master --quiet --objects --missing=print \
140 - | awk -f print_1.awk \
141 - | sed "s/?//" \
142 - | sort >observed.oids &&
143 +
144 + git -C pc1 rev-list master..origin/master --quiet --objects --missing=print |
145 + awk -f print_1.awk |
146 + sed "s/?//" |
147 + sort >observed.oids &&
148 +
149 test_line_count = 0 observed.oids
150 '
151
@@ -194,7 +200,7 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
200
201 # Craft a packfile not including that blob.
202 git -C "$SERVER" rev-parse HEAD |
197 - git -C "$SERVER" pack-objects --stdout >incomplete.pack &&
203 + git -C "$SERVER" pack-objects --stdout >incomplete.pack &&
204
205 # Replace the existing packfile with the crafted one. The protocol
206 # requires that the packfile be sent in sideband 1, hence the extra
t/t6112-rev-list-filters-objects.sh
+115 -88
@@ -20,24 +20,28 @@ test_expect_success 'setup r1' '
20 '
21
22 test_expect_success 'verify blob:none omits all 5 blobs' '
23 - git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
24 - | awk -f print_2.awk \
25 - | sort >expected &&
26 - git -C r1 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:none \
27 - | awk -f print_1.awk \
28 - | sed "s/~//" \
29 - | sort >observed &&
23 + git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
24 + awk -f print_2.awk |
25 + sort >expected &&
26 +
27 + git -C r1 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:none |
28 + awk -f print_1.awk |
29 + sed "s/~//" |
30 + sort >observed &&
31 +
32 test_cmp observed expected
33 '
34
35 test_expect_success 'verify emitted+omitted == all' '
34 - git -C r1 rev-list HEAD --objects \
35 - | awk -f print_1.awk \
36 - | sort >expected &&
37 - git -C r1 rev-list HEAD --objects --filter-print-omitted --filter=blob:none \
38 - | awk -f print_1.awk \
39 - | sed "s/~//" \
40 - | sort >observed &&
36 + git -C r1 rev-list HEAD --objects |
37 + awk -f print_1.awk |
38 + sort >expected &&
39 +
40 + git -C r1 rev-list HEAD --objects --filter-print-omitted --filter=blob:none |
41 + awk -f print_1.awk |
42 + sed "s/~//" |
43 + sort >observed &&
44 +
45 test_cmp observed expected
46 '
47
@@ -58,65 +62,76 @@ test_expect_success 'setup r2' '
62 '
63
64 test_expect_success 'verify blob:limit=500 omits all blobs' '
61 - git -C r2 ls-files -s large.1000 large.10000 \
62 - | awk -f print_2.awk \
63 - | sort >expected &&
64 - git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=500 \
65 - | awk -f print_1.awk \
66 - | sed "s/~//" \
67 - | sort >observed &&
65 + git -C r2 ls-files -s large.1000 large.10000 |
66 + awk -f print_2.awk |
67 + sort >expected &&
68 +
69 + git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=500 |
70 + awk -f print_1.awk |
71 + sed "s/~//" |
72 + sort >observed &&
73 +
74 test_cmp observed expected
75 '
76
77 test_expect_success 'verify emitted+omitted == all' '
72 - git -C r2 rev-list HEAD --objects \
73 - | awk -f print_1.awk \
74 - | sort >expected &&
75 - git -C r2 rev-list HEAD --objects --filter-print-omitted --filter=blob:limit=500 \
76 - | awk -f print_1.awk \
77 - | sed "s/~//" \
78 - | sort >observed &&
78 + git -C r2 rev-list HEAD --objects |
79 + awk -f print_1.awk |
80 + sort >expected &&
81 +
82 + git -C r2 rev-list HEAD --objects --filter-print-omitted --filter=blob:limit=500 |
83 + awk -f print_1.awk |
84 + sed "s/~//" |
85 + sort >observed &&
86 +
87 test_cmp observed expected
88 '
89
90 test_expect_success 'verify blob:limit=1000' '
83 - git -C r2 ls-files -s large.1000 large.10000 \
84 - | awk -f print_2.awk \
85 - | sort >expected &&
86 - git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1000 \
87 - | awk -f print_1.awk \
88 - | sed "s/~//" \
89 - | sort >observed &&
91 + git -C r2 ls-files -s large.1000 large.10000 |
92 + awk -f print_2.awk |
93 + sort >expected &&
94 +
95 + git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1000 |
96 + awk -f print_1.awk |
97 + sed "s/~//" |
98 + sort >observed &&
99 +
100 test_cmp observed expected
101 '
102
103 test_expect_success 'verify blob:limit=1001' '
94 - git -C r2 ls-files -s large.10000 \
95 - | awk -f print_2.awk \
96 - | sort >expected &&
97 - git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1001 \
98 - | awk -f print_1.awk \
99 - | sed "s/~//" \
100 - | sort >observed &&
104 + git -C r2 ls-files -s large.10000 |
105 + awk -f print_2.awk |
106 + sort >expected &&
107 +
108 + git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1001 |
109 + awk -f print_1.awk |
110 + sed "s/~//" |
111 + sort >observed &&
112 +
113 test_cmp observed expected
114 '
115
116 test_expect_success 'verify blob:limit=1k' '
105 - git -C r2 ls-files -s large.10000 \
106 - | awk -f print_2.awk \
107 - | sort >expected &&
108 - git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1k \
109 - | awk -f print_1.awk \
110 - | sed "s/~//" \
111 - | sort >observed &&
117 + git -C r2 ls-files -s large.10000 |
118 + awk -f print_2.awk |
119 + sort >expected &&
120 +
121 + git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1k |
122 + awk -f print_1.awk |
123 + sed "s/~//" |
124 + sort >observed &&
125 +
126 test_cmp observed expected
127 '
128
129 test_expect_success 'verify blob:limit=1m' '
116 - git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1m \
117 - | awk -f print_1.awk \
118 - | sed "s/~//" \
119 - | sort >observed &&
130 + git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1m |
131 + awk -f print_1.awk |
132 + sed "s/~//" |
133 + sort >observed &&
134 +
135 test_must_be_empty observed
136 '
137
@@ -141,24 +156,28 @@ test_expect_success 'setup r3' '
156 '
157
158 test_expect_success 'verify sparse:path=pattern1 omits top-level files' '
144 - git -C r3 ls-files -s sparse1 sparse2 \
145 - | awk -f print_2.awk \
146 - | sort >expected &&
147 - git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern1 \
148 - | awk -f print_1.awk \
149 - | sed "s/~//" \
150 - | sort >observed &&
159 + git -C r3 ls-files -s sparse1 sparse2 |
160 + awk -f print_2.awk |
161 + sort >expected &&
162 +
163 + git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern1 |
164 + awk -f print_1.awk |
165 + sed "s/~//" |
166 + sort >observed &&
167 +
168 test_cmp observed expected
169 '
170
171 test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
155 - git -C r3 ls-files -s sparse2 dir1/sparse2 \
156 - | awk -f print_2.awk \
157 - | sort >expected &&
158 - git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern2 \
159 - | awk -f print_1.awk \
160 - | sed "s/~//" \
161 - | sort >observed &&
172 + git -C r3 ls-files -s sparse2 dir1/sparse2 |
173 + awk -f print_2.awk |
174 + sort >expected &&
175 +
176 + git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern2 |
177 + awk -f print_1.awk |
178 + sed "s/~//" |
179 + sort >observed &&
180 +
181 test_cmp observed expected
182 '
183
@@ -173,25 +192,30 @@ test_expect_success 'setup r3 part 2' '
192 '
193
194 test_expect_success 'verify sparse:oid=OID omits top-level files' '
176 - git -C r3 ls-files -s pattern sparse1 sparse2 \
177 - | awk -f print_2.awk \
178 - | sort >expected &&
195 + git -C r3 ls-files -s pattern sparse1 sparse2 |
196 + awk -f print_2.awk |
197 + sort >expected &&
198 +
199 oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
180 - git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=$oid \
181 - | awk -f print_1.awk \
182 - | sed "s/~//" \
183 - | sort >observed &&
200 +
201 + git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=$oid |
202 + awk -f print_1.awk |
203 + sed "s/~//" |
204 + sort >observed &&
205 +
206 test_cmp observed expected
207 '
208
209 test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
188 - git -C r3 ls-files -s pattern sparse1 sparse2 \
189 - | awk -f print_2.awk \
190 - | sort >expected &&
191 - git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=master:pattern \
192 - | awk -f print_1.awk \
193 - | sed "s/~//" \
194 - | sort >observed &&
210 + git -C r3 ls-files -s pattern sparse1 sparse2 |
211 + awk -f print_2.awk |
212 + sort >expected &&
213 +
214 + git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=master:pattern |
215 + awk -f print_1.awk |
216 + sed "s/~//" |
217 + sort >observed &&
218 +
219 test_cmp observed expected
220 '
221
@@ -199,17 +223,20 @@ test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
223 # This models previously omitted objects that we did not receive.
224
225 test_expect_success 'rev-list W/ --missing=print' '
202 - git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
203 - | awk -f print_2.awk \
204 - | sort >expected &&
226 + git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
227 + awk -f print_2.awk |
228 + sort >expected &&
229 +
230 for id in `cat expected | sed "s|..|&/|"`
231 do
232 rm r1/.git/objects/$id
233 done &&
209 - git -C r1 rev-list --quiet HEAD --missing=print --objects \
210 - | awk -f print_1.awk \
211 - | sed "s/?//" \
212 - | sort >observed &&
234 +
235 + git -C r1 rev-list --quiet HEAD --missing=print --objects |
236 + awk -f print_1.awk |
237 + sed "s/?//" |
238 + sort >observed &&
239 +
240 test_cmp observed expected
241 '
242