Re[2]: Possible bug: --ext-diff ignored with --cc in git log

2016-03-11 Thread Vadim Zeitlin
On Fri, 11 Mar 2016 10:20:42 -0800 Junio C Hamano wrote: JCH> Vadim Zeitlin writes: JCH> JCH> > Thank you for your reply, Junio, I hadn't realized that --cc was dependent JCH> > on textual diff output format before, but now I understand why it can't JCH> > respect --ext-diff. JCH> JCH> Havin

Re: Possible bug: --ext-diff ignored with --cc in git log

2016-03-11 Thread Jeff King
On Fri, Mar 11, 2016 at 11:08:32AM -0800, Junio C Hamano wrote: > Jeff King writes: > > >> It happens that the above is fairly easily doable with today's Git > >> without any modification. Here is how. > >> [...] > > > > I think an even easier way is: > > > > git log --cc --raw > > > > I know

Re: Possible bug: --ext-diff ignored with --cc in git log

2016-03-11 Thread Junio C Hamano
Jeff King writes: >> It happens that the above is fairly easily doable with today's Git >> without any modification. Here is how. >> [...] > > I think an even easier way is: > > git log --cc --raw > > I know that is somewhat beside the point you are making, which is how we > should handle "--c

Re: Possible bug: --ext-diff ignored with --cc in git log

2016-03-11 Thread Jeff King
On Fri, Mar 11, 2016 at 10:20:42AM -0800, Junio C Hamano wrote: > diff --cc foo.sln > index d7ff46e,6c9aaa1..b829410 > --- a/foo.sln > +++ b/foo.sln > @@@ 1,1 @@@ > - d7ff46ec4a016c6ab7d233b9d4a196ecde623528 - generated file > -6c9aaa1ae63a2255a215c1287e38e75fcc5fc5d3

Re: Possible bug: --ext-diff ignored with --cc in git log

2016-03-11 Thread Junio C Hamano
Vadim Zeitlin writes: > On Thu, 10 Mar 2016 14:33:55 -0800 Junio C Hamano wrote: > > JCH> Vadim Zeitlin writes: > JCH> > JCH> > I.e. the > JCH> > command "git log --ext-diff -p --cc" still outputs the real diff even > for > JCH> > the generated files, as if "--ext-diff" were not given. ... >

Re[2]: Possible bug: --ext-diff ignored with --cc in git log

2016-03-10 Thread Vadim Zeitlin
On Thu, 10 Mar 2016 14:33:55 -0800 Junio C Hamano wrote: JCH> Vadim Zeitlin writes: JCH> JCH> > I.e. the JCH> > command "git log --ext-diff -p --cc" still outputs the real diff even for JCH> > the generated files, as if "--ext-diff" were not given. ... JCH> > Is the current behaviour intentiona

Re: Possible bug: --ext-diff ignored with --cc in git log

2016-03-10 Thread Junio C Hamano
Vadim Zeitlin writes: > I.e. the > command "git log --ext-diff -p --cc" still outputs the real diff even for > the generated files, as if "--ext-diff" were not given. ... > Is the current behaviour intentional? I see it with all the git versions I > tried (1.7.10, 2.1.0, 2.7.0 and v2.8.0-rc1), bu

Possible bug: --ext-diff ignored with --cc in git log

2016-03-09 Thread Vadim Zeitlin
Hello, I use a combination of git attributes and a custom diff driver to ignore the changes to the generated files (that we unfortunately need to keep in our repository) from appearing in "git diff" and "git log" output, i.e.: % cat .gitattributes # Use a custom diff driver for