Re: Strange behaviour of git diff branch1 ... branch2

2012-11-12 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Sat, Oct 27, 2012 at 7:33 PM, Junio C Hamano wrote: >> >> Nguyen Thai Ngoc Duy wrote: >>> >>>Notice the --cc in the first line, which is combined diff. Usually >>>combined-diff is between two points and one parent. Though somehow git >>>passes 4 parents down co

Re: Strange behaviour of git diff branch1 ... branch2

2012-10-27 Thread Nguyen Thai Ngoc Duy
On Sat, Oct 27, 2012 at 7:33 PM, Junio C Hamano wrote: > > > Nguyen Thai Ngoc Duy wrote: >> >>Notice the --cc in the first line, which is combined diff. Usually >>combined-diff is between two points and one parent. Though somehow git >>passes 4 parents down combined-diff.c:show_combined_header, a

Re: Strange behaviour of git diff branch1 ... branch2

2012-10-27 Thread Junio C Hamano
Nguyen Thai Ngoc Duy wrote: > >Notice the --cc in the first line, which is combined diff. Usually >combined-diff is between two points and one parent. Though somehow git >passes 4 parents down combined-diff.c:show_combined_header, as you can >see in the "index" line. I think we should fix rev pa

Re: Strange behaviour of git diff branch1 ... branch2

2012-10-26 Thread Nguyen Thai Ngoc Duy
On Sat, Oct 27, 2012 at 4:26 AM, Aaron Schrab wrote: > I came across this odd question on stackoverflow: > http://stackoverflow.com/q/13092854/1507392 > > > If git diff is run with "..." as a separate argument between two commit-ish > arguments causes it to produce strange output. The dif