diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-04-12 19:15:10 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-11 12:47:31 +0900 |
| commit | c9609398580518dffaadaace17188c901a4a4522 (patch) | |
| tree | 25ae1ad072e1679c985263d657393bd05a5c1003 /t/t4209-log-pickaxe.sh | |
| parent | pickaxe tests: refactor to use test_commit --append --printf (diff) | |
| download | tgif-c9609398580518dffaadaace17188c901a4a4522.tar.xz | |
pickaxe tests: add test for diffgrep_consume() internals
In diffgrep_consume() we generate a diff, and then advance past the
"+" or "-" at the start of the line for matching. This has been done
ever since the code was added in f506b8e8b5f (git log/diff: add
-G<regexp> that greps in the patch text, 2010-08-23).
If we match "line" instead of "line + 1" no tests fail, i.e. we've got
zero coverage for whether any of our searches match the beginning of
the line or not. Let's add a test for this.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4209-log-pickaxe.sh')
| -rwxr-xr-x | t/t4209-log-pickaxe.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh index ad45d8cfd0..eacb9f0a1b 100755 --- a/t/t4209-log-pickaxe.sh +++ b/t/t4209-log-pickaxe.sh @@ -106,6 +106,21 @@ test_expect_success 'log -S --no-textconv (missing textconv tool)' ' rm .gitattributes ' +test_expect_success 'setup log -[GS] plain' ' + test_create_repo GS-plain && + test_commit -C GS-plain --append A data.txt "a" && + test_commit -C GS-plain --append B data.txt "a a" && + test_commit -C GS-plain C data.txt "" && + git -C GS-plain log >full-log +' + +test_expect_success 'log -G trims diff new/old [-+]' ' + git -C GS-plain log -G"[+-]a" >log && + test_must_be_empty log && + git -C GS-plain log -G"^a" >log && + test_cmp log full-log +' + test_expect_success 'setup log -[GS] binary & --text' ' test_create_repo GS-bin-txt && test_commit -C GS-bin-txt --printf A data.bin "a\na\0a\n" && |