X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=diffcore-pickaxe.c;h=a9c6d60df22862e47ccb7fc1c7de9ed7cc4b1236;hb=ecdc7cbbac04241f1e5a90fb1fff13cff2ed7a82;hp=ad939d2861554746a9fd52947a38943928ece552;hpb=932b867be0cec606ec7355fc25de13ace42f4c71;p=thirdparty%2Fgit.git

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index ad939d2861..a9c6d60df2 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);