Re: [PATCH v1 1/2] log -G: Ignore binary files
From: Jeff King <hidden>
Date: 2018-11-22 16:20:28
On Wed, Nov 21, 2018 at 09:52:27PM +0100, Thomas Braun wrote:
quoted hunk ↗ jump to hunk
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 the user passes "-a" to treat binary files as text, we should probably skip the binary check. I think we'd need to check "o->flags.text" here.
quoted hunk ↗ jump to hunk
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)' '[...] +test_expect_success 'log -G ignores binary files' ' [...] +test_expect_success 'log -G looks into binary files with textconv filter' '
And likewise add a test here similar to the textconv one. -Peff