Skip to contentSkip to conversation

reftable related tweaks to t1410

PATCH New Han-Wen Nienhuys via GitGitGadget 1 participant 3 messages Feb 9, 2022

lore
Share & tools
lore

Han-Wen Nienhuys via GitGitGadget

author
#0 lore raw

cover reftable related tweaks to t1410

This adapts two tests in t1410 for use with reftable.

Han-Wen Nienhuys (2):
t1410: use test-tool ref-store to inspect reflogs
t1410: mark bufsize boundary test as REFFILES

 t/t1410-reflog.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

base-commit: 38062e73e009f27ea192d50481fcb5e7b0e9d6eb
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1213%2Fhanwen%2Ft1410-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1213/hanwen/t1410-v1
Pull-Request: https://github.com/git/git/pull/1213

Signature · 1 line
gitgitgadget
author
#1 lore raw

PATCH 1/2 t1410: use test-tool ref-store to inspect reflogs

From: Han-Wen Nienhuys <[email protected]>

This makes the test compatible with reftable (it doesn't pass yet for other reasons, unfortunately)

Signed-off-by Han-Wen Nienhuys <[email protected]>
---
 t/t1410-reflog.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
t/t1410-reflog.sh +2 -1
index d7ddf7612d4..36f6693d9d3 100755
@@ -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
 	)
 '
Signature · 1 line
gitgitgadget
author
#2 lore raw

PATCH 2/2 t1410: mark bufsize boundary test as REFFILES

In reply to Han-Wen Nienhuys via GitGitGadget

From: Han-Wen Nienhuys <[email protected]>

This test fiddles with files under .git/logs to recreate a condition that is unlikely to warrant special attention under reftable, as reflog blocks are zlib compressed.

Signed-off-by Han-Wen Nienhuys <[email protected]>
---
 t/t1410-reflog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
t/t1410-reflog.sh +1 -1
index 36f6693d9d3..68f69bb5431 100755
@@ -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" &&
Signature · 1 line
gitgitgadget