Re: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-19 Thread Jeff King
On Wed, Jul 18, 2012 at 03:47:21PM -0700, Junio C Hamano wrote: > > I don't care too deeply either way, and it is technically a behavior > > change. So there is a chance of regression for something that nobody has > > actually complained about. > > Thanks. I share the same feeling, but the code a

Re: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-18 Thread Junio C Hamano
Jeff King writes: > I don't care too deeply either way, and it is technically a behavior > change. So there is a chance of regression for something that nobody has > actually complained about. Thanks. I share the same feeling, but the code after the patch looks much nicer, which is somewhat sad.

Re: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-18 Thread Jeff King
On Wed, Jul 18, 2012 at 02:23:29AM -0400, Jeff King wrote: > > * The use of userdiff_find_by_path() in run_diff_cmd() may be iffy; > >it is probably OK to override diff.external with a more specific > >per-path configuration, but I think an external diff specified by > >the GIT_EXTERN

Re: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-17 Thread Jeff King
On Tue, Jul 17, 2012 at 10:08:59PM -0700, Junio C Hamano wrote: > The impression I got from Peff's review was that the problem > description in the proposed commit log message did not describe the > reality at all, and the added three lines did not do what the > message implied they do. So I do n

Re: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-17 Thread Junio C Hamano
"Jakub Vrana" writes: > Yes, I was fixing the invalid (!pgm) condition, sorry for a non-precise > description. > > Does it mean that my patch is accepted or is there something else I need to > do? The impression I got from Peff's review was that the problem description in the proposed commit l

RE: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-17 Thread Jakub Vrana
Vrana Cc: git@vger.kernel.org; gits...@pobox.com Subject: Re: [PATCH] diff: respect --no-ext-diff with typechange On Mon, Jul 16, 2012 at 05:27:00PM -0700, Jakub Vrana wrote: > If external diff is specified through diff.external then it is used > even if `git diff --no-ext-diff` is use

Re: [PATCH] diff: respect --no-ext-diff with typechange

2012-07-16 Thread Jeff King
On Mon, Jul 16, 2012 at 05:27:00PM -0700, Jakub Vrana wrote: > If external diff is specified through diff.external then it is used even if > `git diff --no-ext-diff` is used when there is a typechange. Eek. That has some minor security implications, as it means that it is dangerous to run even pl

[PATCH] diff: respect --no-ext-diff with typechange

2012-07-16 Thread Jakub Vrana
If external diff is specified through diff.external then it is used even if `git diff --no-ext-diff` is used when there is a typechange. Signed-off-by: Jakub Vrana --- diff.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index 208096f..898d610 100644 --- a/diff.c +++