Skip to content

Commit ebb866a

Browse files
committed
Merge branch 'hw/t1410-adjust-test-for-reftable'
Fix tests that are unnecessarily specific to ref-files backend. * hw/t1410-adjust-test-for-reftable: t1410: mark bufsize boundary test as REFFILES t1410: use test-tool ref-store to inspect reflogs
2 parents 68fd3b3 + bcdff62 commit ebb866a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

t/t1410-reflog.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
341341
# Each line is 114 characters, so we need 75 to still have a few before the
342342
# last 8K. The 89-character padding on the final entry lines up our
343343
# newline exactly.
344-
test_expect_success SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
344+
test_expect_success REFFILES,SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
345345
git checkout -b reflogskip &&
346346
zf=$(test_oid zero_2) &&
347347
ident="abc <xyz> 0000000001 +0000" &&
@@ -418,7 +418,8 @@ test_expect_success 'expire with multiple worktrees' '
418418
test_commit -C link-wt foobar &&
419419
test_tick &&
420420
git reflog expire --verbose --all --expire=$test_tick &&
421-
test_must_be_empty .git/worktrees/link-wt/logs/HEAD
421+
test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
422+
test_must_be_empty actual
422423
)
423424
'
424425

0 commit comments

Comments
 (0)