Skip to content

Commit fe8fc09

Browse files
hanwengitster
authored andcommitted
t1404: mark tests that muck with .git directly as REFFILES.
The packed/loose ref storage is an overlay combination of packed-refs (refs and tags in a single file) and one-file-per-ref. This creates all kinds of edge cases related to directory/file conflicts, (non-)empty directories, and the locking scheme, none of which applies to reftable. Signed-off-by: Han-Wen Nienhuys <[email protected]> Reviewed-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a570963 commit fe8fc09

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

t/t1404-update-ref-errors.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ test_expect_success 'one new ref is a simple prefix of another' '
189189
190190
'
191191

192-
test_expect_success 'empty directory should not fool rev-parse' '
192+
test_expect_success REFFILES 'empty directory should not fool rev-parse' '
193193
prefix=refs/e-rev-parse &&
194194
git update-ref $prefix/foo $C &&
195195
git pack-refs --all &&
@@ -199,7 +199,7 @@ test_expect_success 'empty directory should not fool rev-parse' '
199199
test_cmp expected actual
200200
'
201201

202-
test_expect_success 'empty directory should not fool for-each-ref' '
202+
test_expect_success REFFILES 'empty directory should not fool for-each-ref' '
203203
prefix=refs/e-for-each-ref &&
204204
git update-ref $prefix/foo $C &&
205205
git for-each-ref $prefix >expected &&
@@ -209,14 +209,14 @@ test_expect_success 'empty directory should not fool for-each-ref' '
209209
test_cmp expected actual
210210
'
211211

212-
test_expect_success 'empty directory should not fool create' '
212+
test_expect_success REFFILES 'empty directory should not fool create' '
213213
prefix=refs/e-create &&
214214
mkdir -p .git/$prefix/foo/bar/baz &&
215215
printf "create %s $C\n" $prefix/foo |
216216
git update-ref --stdin
217217
'
218218

219-
test_expect_success 'empty directory should not fool verify' '
219+
test_expect_success REFFILES 'empty directory should not fool verify' '
220220
prefix=refs/e-verify &&
221221
git update-ref $prefix/foo $C &&
222222
git pack-refs --all &&
@@ -225,7 +225,7 @@ test_expect_success 'empty directory should not fool verify' '
225225
git update-ref --stdin
226226
'
227227

228-
test_expect_success 'empty directory should not fool 1-arg update' '
228+
test_expect_success REFFILES 'empty directory should not fool 1-arg update' '
229229
prefix=refs/e-update-1 &&
230230
git update-ref $prefix/foo $C &&
231231
git pack-refs --all &&
@@ -234,7 +234,7 @@ test_expect_success 'empty directory should not fool 1-arg update' '
234234
git update-ref --stdin
235235
'
236236

237-
test_expect_success 'empty directory should not fool 2-arg update' '
237+
test_expect_success REFFILES 'empty directory should not fool 2-arg update' '
238238
prefix=refs/e-update-2 &&
239239
git update-ref $prefix/foo $C &&
240240
git pack-refs --all &&
@@ -243,7 +243,7 @@ test_expect_success 'empty directory should not fool 2-arg update' '
243243
git update-ref --stdin
244244
'
245245

246-
test_expect_success 'empty directory should not fool 0-arg delete' '
246+
test_expect_success REFFILES 'empty directory should not fool 0-arg delete' '
247247
prefix=refs/e-delete-0 &&
248248
git update-ref $prefix/foo $C &&
249249
git pack-refs --all &&
@@ -252,7 +252,7 @@ test_expect_success 'empty directory should not fool 0-arg delete' '
252252
git update-ref --stdin
253253
'
254254

255-
test_expect_success 'empty directory should not fool 1-arg delete' '
255+
test_expect_success REFFILES 'empty directory should not fool 1-arg delete' '
256256
prefix=refs/e-delete-1 &&
257257
git update-ref $prefix/foo $C &&
258258
git pack-refs --all &&
@@ -466,7 +466,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref delete' '
466466
test_cmp expected output.err
467467
'
468468

469-
test_expect_success 'non-empty directory blocks create' '
469+
test_expect_success REFFILES 'non-empty directory blocks create' '
470470
prefix=refs/ne-create &&
471471
mkdir -p .git/$prefix/foo/bar &&
472472
: >.git/$prefix/foo/bar/baz.lock &&
@@ -485,7 +485,7 @@ test_expect_success 'non-empty directory blocks create' '
485485
test_cmp expected output.err
486486
'
487487

488-
test_expect_success 'broken reference blocks create' '
488+
test_expect_success REFFILES 'broken reference blocks create' '
489489
prefix=refs/broken-create &&
490490
mkdir -p .git/$prefix &&
491491
echo "gobbledigook" >.git/$prefix/foo &&
@@ -504,7 +504,7 @@ test_expect_success 'broken reference blocks create' '
504504
test_cmp expected output.err
505505
'
506506

507-
test_expect_success 'non-empty directory blocks indirect create' '
507+
test_expect_success REFFILES 'non-empty directory blocks indirect create' '
508508
prefix=refs/ne-indirect-create &&
509509
git symbolic-ref $prefix/symref $prefix/foo &&
510510
mkdir -p .git/$prefix/foo/bar &&
@@ -524,7 +524,7 @@ test_expect_success 'non-empty directory blocks indirect create' '
524524
test_cmp expected output.err
525525
'
526526

527-
test_expect_success 'broken reference blocks indirect create' '
527+
test_expect_success REFFILES 'broken reference blocks indirect create' '
528528
prefix=refs/broken-indirect-create &&
529529
git symbolic-ref $prefix/symref $prefix/foo &&
530530
echo "gobbledigook" >.git/$prefix/foo &&
@@ -543,7 +543,7 @@ test_expect_success 'broken reference blocks indirect create' '
543543
test_cmp expected output.err
544544
'
545545

546-
test_expect_success 'no bogus intermediate values during delete' '
546+
test_expect_success REFFILES 'no bogus intermediate values during delete' '
547547
prefix=refs/slow-transaction &&
548548
# Set up a reference with differing loose and packed versions:
549549
git update-ref $prefix/foo $C &&
@@ -600,7 +600,7 @@ test_expect_success 'no bogus intermediate values during delete' '
600600
test_must_fail git rev-parse --verify --quiet $prefix/foo
601601
'
602602

603-
test_expect_success 'delete fails cleanly if packed-refs file is locked' '
603+
test_expect_success REFFILES 'delete fails cleanly if packed-refs file is locked' '
604604
prefix=refs/locked-packed-refs &&
605605
# Set up a reference with differing loose and packed versions:
606606
git update-ref $prefix/foo $C &&
@@ -616,7 +616,7 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' '
616616
test_cmp unchanged actual
617617
'
618618

619-
test_expect_success 'delete fails cleanly if packed-refs.new write fails' '
619+
test_expect_success REFFILES 'delete fails cleanly if packed-refs.new write fails' '
620620
# Setup and expectations are similar to the test above.
621621
prefix=refs/failed-packed-refs &&
622622
git update-ref $prefix/foo $C &&

0 commit comments

Comments
 (0)