From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, sbeller@google.com,
avarab@gmail.com, Thomas Braun <thomas.braun@virtuell-zuhause.de>
Subject: [PATCH v2] log -G: Ignore binary files
Date: Wed, 28 Nov 2018 12:32:57 +0100 [thread overview]
Message-ID: <c4eac0b0ff0812e5aa8b081e603fc8bdd042ddeb.1543403143.git.thomas.braun@virtuell-zuhause.de> (raw)
In-Reply-To: <1535679074.141165.1542834055343@ox.hosteurope.de>
The -G<regex> option of log looks for the differences whose patch text
contains added/removed lines that match regex.
As the concept of patch text only makes sense for text files, we need to
ignore binary files when searching with -G <regex> as well.
The -S<block of text> option of log looks for differences that changes
the number of occurrences of the specified block of text (i.e.
addition/deletion) in a file. As we want to keep the current behaviour,
add a test to ensure it.
Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
---
Changes since v1:
- Merged both patches into one
- Adapted commit messages
- Added missing support for -a flag with tests
- Placed new code into correct location to be able to reuse an existing
optimization
- Uses help-suggested -Ga writing without spaces
- Uses orphan branches instead of cannonball cleanup with rm -rf
- Changed search text to make it clear that it is not about the \0 boundary
Documentation/gitdiffcore.txt | 2 +-
diffcore-pickaxe.c | 6 ++++++
t/t4209-log-pickaxe.sh | 40 +++++++++++++++++++++++++++++++++++
3 files changed, 47 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..4cea086f80 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -154,6 +154,12 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
if (textconv_one == textconv_two && diff_unmodified_pair(p))
return 0;
+ if ((o->pickaxe_opts & DIFF_PICKAXE_KIND_G) &&
+ !o->flags.text &&
+ ((!textconv_one && diff_filespec_is_binary(o->repo, p->one)) ||
+ (!textconv_two && diff_filespec_is_binary(o->repo, p->two))))
+ return 0;
+
mf1.size = fill_textconv(o->repo, textconv_one, p->one, &mf1.ptr);
mf2.size = fill_textconv(o->repo, textconv_two, p->two, &mf2.ptr);
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 844df760f7..5c3e2a16b2 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -106,4 +106,44 @@ test_expect_success 'log -S --no-textconv (missing textconv tool)' '
rm .gitattributes
'
+test_expect_success 'log -G ignores binary files' '
+ git checkout --orphan orphan1 &&
+ printf "a\0a" >data.bin &&
+ git add data.bin &&
+ git commit -m "message" &&
+ git log -Ga >result &&
+ test_must_be_empty result
+'
+
+test_expect_success 'log -G looks into binary files with -a' '
+ git checkout --orphan orphan2 &&
+ printf "a\0a" >data.bin &&
+ git add data.bin &&
+ git commit -m "message" &&
+ git log -a -Ga >actual &&
+ git log >expected &&
+ test_cmp actual expected
+'
+
+test_expect_success 'log -G looks into binary files with textconv filter' '
+ git checkout --orphan orphan3 &&
+ echo "* diff=bin" > .gitattributes &&
+ printf "a\0a" >data.bin &&
+ git add data.bin &&
+ git commit -m "message" &&
+ git -c diff.bin.textconv=cat log -Ga >actual &&
+ git log >expected &&
+ test_cmp actual expected
+'
+
+test_expect_success 'log -S looks into binary files' '
+ git checkout --orphan orphan4 &&
+ printf "a\0a" >data.bin &&
+ git add data.bin &&
+ git commit -m "message" &&
+ git log -Sa >actual &&
+ git log >expected &&
+ test_cmp actual expected
+'
+
test_done
--
2.19.0.271.gfe8321ec05.dirty
next prev parent reply other threads:[~2018-11-28 11:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 20:52 [PATCH 0/2] Teach log -G to ignore binary files Thomas Braun
2018-11-21 20:52 ` [PATCH v1 1/2] log -G: Ignore " Thomas Braun
2018-11-21 20:52 ` [PATCH v1 2/2] log -S: Add test which searches in " Thomas Braun
2018-11-21 21:00 ` [PATCH 0/2] Teach log -G to ignore " Thomas Braun
2018-11-28 11:32 ` Thomas Braun [this message]
2018-11-28 12:54 ` [PATCH v2] log -G: Ignore " Ævar Arnfjörð Bjarmason
2018-12-14 18:44 ` Thomas Braun
2018-11-29 7:10 ` Junio C Hamano
2018-11-29 7:22 ` Junio C Hamano
2018-12-14 18:45 ` Thomas Braun
2018-12-14 18:45 ` Thomas Braun
2018-12-14 18:49 ` [PATCH v3] log -G: ignore " Thomas Braun
2018-12-26 23:24 ` Junio C Hamano
2018-11-22 1:34 ` [PATCH v1 2/2] log -S: Add test which searches in " Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 9:14 ` Ævar Arnfjörð Bjarmason
2018-11-24 2:27 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 1:29 ` [PATCH v1 1/2] log -G: Ignore " Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-22 10:16 ` Ævar Arnfjörð Bjarmason
2018-11-22 16:27 ` Jeff King
2018-11-28 11:31 ` Thomas Braun
2018-11-28 11:31 ` Thomas Braun
2018-11-22 16:20 ` Jeff King
2018-11-24 2:32 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
2018-11-26 20:19 ` Stefan Beller
2018-11-27 0:51 ` Junio C Hamano
2018-11-28 11:31 ` Thomas Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4eac0b0ff0812e5aa8b081e603fc8bdd042ddeb.1543403143.git.thomas.braun@virtuell-zuhause.de \
--to=thomas.braun@virtuell-zuhause.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).