summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-23 16:58:03 -0800
commitebb866adae4f2a13939d0a4bd6901a506e911dba (patch)
tree81f4fa3cdc25a2b3e27ded46d45d743f95506c39
parentMerge branch 'ps/fetch-optim-with-commit-graph' (diff)
parentt1410: mark bufsize boundary test as REFFILES (diff)
downloadtgif-ebb866adae4f2a13939d0a4bd6901a506e911dba.tar.xz
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
-rwxr-xr-xt/t1410-reflog.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index d7ddf7612d..68f69bb543 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -341,7 +341,7 @@ test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
# Each line is 114 characters, so we need 75 to still have a few before the
# last 8K. The 89-character padding on the final entry lines up our
# newline exactly.
-test_expect_success SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
+test_expect_success REFFILES,SHA1 'parsing reverse reflogs at BUFSIZ boundaries' '
git checkout -b reflogskip &&
zf=$(test_oid zero_2) &&
ident="abc <xyz> 0000000001 +0000" &&
@@ -418,7 +418,8 @@ test_expect_success 'expire with multiple worktrees' '
test_commit -C link-wt foobar &&
test_tick &&
git reflog expire --verbose --all --expire=$test_tick &&
- test_must_be_empty .git/worktrees/link-wt/logs/HEAD
+ test-tool ref-store worktree:link-wt for-each-reflog-ent HEAD >actual &&
+ test_must_be_empty actual
)
'