Skip to content

Commit d5b78fd

Browse files
committed
regression: stop checking for existence of refs directories
git 2.13 changed the behavior of the ref directory cleanup code, so that empty directories are removed more agressively. The previous commit by Eric fixes the failures on git 2.13 and newer, but breaks the tests for older versions. The simplest way to make the tests work for all versions, is to stop checking for the existence of ref/patches subdirectories. In the future (when git's refs API actually becomes a thing), we might have to rewrite the ref checking code as well since we won't be guaranteed that each ref will show up as a file in .git/refs/patches. Signed-off-by: Josef 'Jeff' Sipek <[email protected]>
1 parent 71d571b commit d5b78fd

20 files changed

+0
-350
lines changed

Diff for: regression/scaffold

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ function list_files
8282
{
8383
(
8484
find .git/refs/patches -type f -exec dump_ref {} \; 2> /dev/null || true
85-
find .git/refs/patches -type d -exec dump_reg {} \; 2> /dev/null || true
8685
find .git/patches -exec dump_reg {} \;
8786
) | sort
8887
}

Diff for: regression/t-020.out

-49
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ Patch applied.
55
% list_files
66
d .git/patches
77
d .git/patches/master
8-
d .git/refs/patches
9-
d .git/refs/patches/master
108
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
119
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
1210
f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
@@ -20,8 +18,6 @@ Patch applied.
2018
% list_files
2119
d .git/patches
2220
d .git/patches/master
23-
d .git/refs/patches
24-
d .git/refs/patches/master
2521
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
2622
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
2723
f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/master/status
@@ -36,8 +32,6 @@ Patch applied.
3632
% list_files
3733
d .git/patches
3834
d .git/patches/master
39-
d .git/refs/patches
40-
d .git/refs/patches/master
4135
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
4236
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
4337
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -53,8 +47,6 @@ Patch applied.
5347
% list_files
5448
d .git/patches
5549
d .git/patches/master
56-
d .git/refs/patches
57-
d .git/refs/patches/master
5850
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
5951
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
6052
f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
@@ -72,8 +64,6 @@ File series fully applied, ends at patch mode
7264
% list_files
7365
d .git/patches
7466
d .git/patches/master
75-
d .git/refs/patches
76-
d .git/refs/patches/master
7767
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
7868
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
7969
f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
@@ -92,8 +82,6 @@ Patch applied.
9282
% list_files
9383
d .git/patches
9484
d .git/patches/master
95-
d .git/refs/patches
96-
d .git/refs/patches/master
9785
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
9886
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
9987
f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
@@ -109,8 +97,6 @@ Patch applied.
10997
% list_files
11098
d .git/patches
11199
d .git/patches/master
112-
d .git/refs/patches
113-
d .git/refs/patches/master
114100
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
115101
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
116102
f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
@@ -126,8 +112,6 @@ Patch applied.
126112
% list_files
127113
d .git/patches
128114
d .git/patches/master
129-
d .git/refs/patches
130-
d .git/refs/patches/master
131115
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
132116
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
133117
f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
@@ -143,8 +127,6 @@ Patch applied.
143127
% list_files
144128
d .git/patches
145129
d .git/patches/master
146-
d .git/refs/patches
147-
d .git/refs/patches/master
148130
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
149131
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
150132
f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
@@ -160,8 +142,6 @@ Patch applied.
160142
% list_files
161143
d .git/patches
162144
d .git/patches/master
163-
d .git/refs/patches
164-
d .git/refs/patches/master
165145
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
166146
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
167147
f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
@@ -175,8 +155,6 @@ Patch applied.
175155
% list_files
176156
d .git/patches
177157
d .git/patches/master
178-
d .git/refs/patches
179-
d .git/refs/patches/master
180158
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
181159
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
182160
f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/master/status
@@ -191,8 +169,6 @@ Patch applied.
191169
% list_files
192170
d .git/patches
193171
d .git/patches/master
194-
d .git/refs/patches
195-
d .git/refs/patches/master
196172
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
197173
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
198174
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -208,8 +184,6 @@ Patch applied.
208184
% list_files
209185
d .git/patches
210186
d .git/patches/master
211-
d .git/refs/patches
212-
d .git/refs/patches/master
213187
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
214188
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
215189
f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
@@ -227,7 +201,6 @@ Invalid number of patches to push.
227201
% list_files
228202
d .git/patches
229203
d .git/patches/master
230-
d .git/refs/patches
231204
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
232205
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
233206
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -241,7 +214,6 @@ Invalid number of patches to push.
241214
% list_files
242215
d .git/patches
243216
d .git/patches/master
244-
d .git/refs/patches
245217
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
246218
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
247219
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -255,7 +227,6 @@ Patch is already applied.
255227
% list_files
256228
d .git/patches
257229
d .git/patches/master
258-
d .git/refs/patches
259230
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
260231
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
261232
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -270,8 +241,6 @@ Patch applied.
270241
% list_files
271242
d .git/patches
272243
d .git/patches/master
273-
d .git/refs/patches
274-
d .git/refs/patches/master
275244
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
276245
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
277246
f 7b80669540a0ba5ec6098f50bb7923921278e85a .git/patches/master/status
@@ -289,8 +258,6 @@ Patch applied.
289258
% list_files
290259
d .git/patches
291260
d .git/patches/master
292-
d .git/refs/patches
293-
d .git/refs/patches/master
294261
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
295262
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
296263
f 6e9645b29c7233ecdf1494834e83c67a37464548 .git/patches/master/status
@@ -311,8 +278,6 @@ Patch applied.
311278
% list_files
312279
d .git/patches
313280
d .git/patches/master
314-
d .git/refs/patches
315-
d .git/refs/patches/master
316281
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
317282
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
318283
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -336,8 +301,6 @@ Patch applied.
336301
% list_files
337302
d .git/patches
338303
d .git/patches/master
339-
d .git/refs/patches
340-
d .git/refs/patches/master
341304
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
342305
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
343306
f 71596bf71b72c2717e1aee378aabefbfa19ab7c8 .git/patches/master/status
@@ -353,7 +316,6 @@ All patches popped.
353316
% list_files
354317
d .git/patches
355318
d .git/patches/master
356-
d .git/refs/patches
357319
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
358320
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
359321
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -369,8 +331,6 @@ Patch applied.
369331
% list_files
370332
d .git/patches
371333
d .git/patches/master
372-
d .git/refs/patches
373-
d .git/refs/patches/master
374334
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
375335
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
376336
f 9c18cc7abe6b87f18503714a80a677b4094eb457 .git/patches/master/add
@@ -390,8 +350,6 @@ Patch applied.
390350
% list_files
391351
d .git/patches
392352
d .git/patches/master
393-
d .git/refs/patches
394-
d .git/refs/patches/master
395353
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
396354
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
397355
f 7d261b8caad0f161c21daf5de65eeb521ff8c067 .git/patches/master/empty.patch
@@ -410,8 +368,6 @@ Patch applied.
410368
% list_files
411369
d .git/patches
412370
d .git/patches/master
413-
d .git/refs/patches
414-
d .git/refs/patches/master
415371
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
416372
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
417373
f 7ad87a0bdb8cf0a57cfc384633edabbb9c2bfa1b .git/patches/master/empty.patch
@@ -432,8 +388,6 @@ Patch applied.
432388
% list_files
433389
d .git/patches
434390
d .git/patches/master
435-
d .git/refs/patches
436-
d .git/refs/patches/master
437391
f 0803c721968056410df61400bb239380d033b9d5 .git/patches/master/empty.patch
438392
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
439393
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
@@ -454,8 +408,6 @@ Patch applied.
454408
% list_files
455409
d .git/patches
456410
d .git/patches/master
457-
d .git/refs/patches
458-
d .git/refs/patches/master
459411
f 0803c721968056410df61400bb239380d033b9d5 .git/patches/master/empty.patch~
460412
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
461413
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove
@@ -473,7 +425,6 @@ All patches popped.
473425
% list_files
474426
d .git/patches
475427
d .git/patches/master
476-
d .git/refs/patches
477428
f 0803c721968056410df61400bb239380d033b9d5 .git/patches/master/empty.patch~
478429
f 22930c6d1f1938f298a4fca51c57e4b47171db21 .git/patches/master/mode
479430
f 413390f3906f16f30b054a4fb86c1e014b964504 .git/patches/master/remove

0 commit comments

Comments
 (0)