From: Junio C Hamano Date: Sat, 11 Feb 2006 19:32:00 GMT Subject: Re: gitweb using "--cc"? Message-ID: <7vhd75n13j.fsf@assigned-by-dhcp.cox.net> In-Reply-To: Marco Costalba writes: > On 2/9/06, Junio C Hamano wrote: >> >> Does it matter? I presume that a Porcelain that cares would >> rather use the traditional "diff-tree -m -r" to look at diff >> with each parent. I dunno. > > Yes, please preserve this behaviour. >... > Please _do not_ change this behaviour to make -m a no-op as stated in > "diff-tree -c raw output" patch message > (ee63802422af14e43eccce3c6dc4150a27ceb1a3). The one you pulled already contains another one to fix that ee6380 change done by gittus. What "diff-tree -r -m ca1820" shows should be the same as traditional "diff-tree -r -m ca1820" output. What is different is "diff-tree ca1820". It used to show *nothing* only because it is a merge. It now defaults to show "diff-tree -c ca1820". For the sake of backward compatibility we could change it to not output anything, but I sort of feel that is backwards. If a Porcelain wants raw-diff for 1 (or more) parents, "diff-tree -r -m" has been the way to do so before the ee6380 change, and that output has not changed (well ee6380 might have changed it but now it is fixed).