Jeff King <peff@xxxxxxxx> writes: >> + 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. Yeah, I forgot about that option. It would give an escape hatch that has a sane explanation.
