The -G <regex> option of log looks for the differences whose patch text
contains added/removed lines that match regex.
The concept of differences only makes sense for text files, therefore
we need to ignore binary files when searching with -G <regex> as well.
Signed-off-by: Thomas Braun <thomas.br...@virtuell-zuhause.de>
---
Documentation/gitdiffcore.txt | 2 +-
diffcore-pickaxe.c | 5 +++++
t/t4209-log-pickaxe.sh | 22 ++++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index c0a60f3158..059ddd3431 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -242,7 +242,7 @@ textual diff has an added or a deleted line that matches
the given
regular expression. This means that it will detect in-file (or what
rename-detection considers the same file) moves, which is noise. The
implementation runs diff twice and greps, and this can be quite
-expensive.
+expensive. Binary files without textconv filter are ignored.
When `-S` or `-G` are used without `--pickaxe-all`, only filepairs
that match their respective criterion are kept in the output. When
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 69fc55ea1e..8c2558b07d 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -144,6 +144,11 @@ static int pickaxe_match(struct diff_filepair *p, struct
diff_options *o,
textconv_two = get_textconv(o->repo->index, p->two);
}
+ if ((o->pickaxe_opts & DIFF_PICKAXE_KIND_G) &&
+ ((!textconv_one && diff_filespec_is_binary(o->repo, p->one)) ||
+ (!textconv_two && diff_filespec_is_binary(o->repo, p->two))))
+ return 0;
+
/*
* If we have an unmodified pair, we know that the count will be the
* same and don't even have to load the blobs. Unless textconv is in
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 844df760f7..42cc8afd8b 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -106,4 +106,26 @@ test_expect_success 'log -S --no-textconv (missing
textconv tool)' '
rm .gitattributes
'
+test_expect_success 'log -G ignores binary files' '
+ rm -rf .git &&
+ git init &&
+ printf "a\0b" >data.bin &&
+ git add data.bin &&
+ git commit -m "message" &&
+ git log -G a >result &&
+ test_must_be_empty result
+'
+
+test_expect_success 'log -G looks into binary files with textconv filter' '
+ rm -rf .git &&
+ git init &&
+ echo "* diff=bin" > .gitattributes &&
+ printf "a\0b" >data.bin &&
+ git add data.bin &&
+ git commit -m "message" &&
+ git -c diff.bin.textconv=cat log -G a >actual &&
+ git log >expected &&
+ test_cmp actual expected
+'
+
test_done
--
2.19.0.271.gfe8321ec05.dirty
