Skip to content

Commit

Permalink
pickaxe tests: refactor to use test_commit --append --printf
Browse files Browse the repository at this point in the history
Refactor the existing tests added in e0e7cb8 (log -G: ignore
binary files, 2018-12-14) to use the --append option I added in
3373518 (test-lib functions: add an --append option to
test_commit, 2021-01-12) and the --printf option added as part of an
in-flight topic of mine this commit depends on.

While I'm at it change some of the setup of the test to use a more
sensible pattern, e.g. setting up a temporary repo instead of creating
an orphan branch.

Since the -G and -S options will behave the same way with truncated
and removed content also change the "git rm" to emptying data.bin,
that's just catering to how test_commit works. The resulting test is
shorter.

See also f5d79bf (tests: refactor a few tests to use "test_commit
--append", 2021-01-12) for prior similar refactoring.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
avar authored and gitster committed May 11, 2021
1 parent ecbff14 commit 6d0a401
Showing 1 changed file with 14 additions and 16 deletions.
30 changes: 14 additions & 16 deletions t/t4209-log-pickaxe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,37 +107,35 @@ test_expect_success 'log -S --no-textconv (missing textconv tool)' '
'

test_expect_success 'setup log -[GS] binary & --text' '
git checkout --orphan GS-binary-and-text &&
git read-tree --empty &&
printf "a\na\0a\n" >data.bin &&
git add data.bin &&
git commit -m "create binary file" data.bin &&
printf "a\na\0a\n" >>data.bin &&
git commit -m "modify binary file" data.bin &&
git rm data.bin &&
git commit -m "delete binary file" data.bin &&
git log >full-log
test_create_repo GS-bin-txt &&
test_commit -C GS-bin-txt --printf A data.bin "a\na\0a\n" &&
test_commit -C GS-bin-txt --append --printf B data.bin "a\na\0a\n" &&
test_commit -C GS-bin-txt C data.bin "" &&
git -C GS-bin-txt log >full-log
'

test_expect_success 'log -G ignores binary files' '
git log -Ga >log &&
git -C GS-bin-txt log -Ga >log &&
test_must_be_empty log
'

test_expect_success 'log -G looks into binary files with -a' '
git log -a -Ga >log &&
git -C GS-bin-txt log -a -Ga >log &&
test_cmp log full-log
'

test_expect_success 'log -G looks into binary files with textconv filter' '
test_when_finished "rm .gitattributes" &&
echo "* diff=bin" >.gitattributes &&
git -c diff.bin.textconv=cat log -Ga >log &&
test_when_finished "rm GS-bin-txt/.gitattributes" &&
(
cd GS-bin-txt &&
echo "* diff=bin" >.gitattributes &&
git -c diff.bin.textconv=cat log -Ga >../log
) &&
test_cmp log full-log
'

test_expect_success 'log -S looks into binary files' '
git log -Sa >log &&
git -C GS-bin-txt log -Sa >log &&
test_cmp log full-log
'

Expand Down

0 comments on commit 6d0a401

Please sign in to comment.