[PATCH 1/2] diffcore-pickaxe: respect --no-textconv

2013-04-04 Thread Simon Ruderich
git log -S doesn't respect --no-textconv: $ echo '*.txt diff=wrong' .gitattributes $ git -c diff.wrong.textconv='xxx' log --no-textconv -Sfoo error: cannot run xxx: No such file or directory fatal: unable to read files to diff Signed-off-by: Simon Ruderich si...@ruderich.org

Re: [PATCH 1/2] diffcore-pickaxe: respect --no-textconv

2013-04-04 Thread Matthieu Moy
Simon Ruderich si...@ruderich.org writes: This patch should fix it. It does. --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -78,7 +78,6 @@ static void fill_one(struct diff_filespec *one, mmfile_t *mf, struct userdiff_driver **textconv) { if

Re: [PATCH 1/2] diffcore-pickaxe: respect --no-textconv

2013-04-04 Thread Jeff King
On Thu, Apr 04, 2013 at 06:03:59PM +0200, Simon Ruderich wrote: git log -S doesn't respect --no-textconv: $ echo '*.txt diff=wrong' .gitattributes $ git -c diff.wrong.textconv='xxx' log --no-textconv -Sfoo error: cannot run xxx: No such file or directory fatal: unable to

Re: [PATCH 1/2] diffcore-pickaxe: respect --no-textconv

2013-04-04 Thread Junio C Hamano
Simon Ruderich si...@ruderich.org writes: git log -S doesn't respect --no-textconv: $ echo '*.txt diff=wrong' .gitattributes $ git -c diff.wrong.textconv='xxx' log --no-textconv -Sfoo error: cannot run xxx: No such file or directory fatal: unable to read files to diff

Re: [PATCH 1/2] diffcore-pickaxe: respect --no-textconv

2013-04-04 Thread Jeff King
On Thu, Apr 04, 2013 at 10:45:25AM -0700, Junio C Hamano wrote: Simon Ruderich si...@ruderich.org writes: git log -S doesn't respect --no-textconv: $ echo '*.txt diff=wrong' .gitattributes $ git -c diff.wrong.textconv='xxx' log --no-textconv -Sfoo error: cannot run xxx:

Re: [PATCH 1/2] diffcore-pickaxe: respect --no-textconv

2013-04-04 Thread Junio C Hamano
Jeff King p...@peff.net writes: I'm OK with this as-is, but I would also be happy to see the re-ordering and extra cleanup I mentioned elsewhere. Yeah, I agree that the order is the other way around. 2/2 could be retitled to say that fill_one() no longer needs to touch, but swapping the order