From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 27 Oct 2012 12:33:01 GMT
Subject: Re: Strange behaviour of git diff branch1 ... branch2
Message-ID: <4ecbe65e-4b56-4a49-96c3-1ea8b3f0c473@email.android.com>
In-Reply-To: <CACsJy8CX4Wbf3Bqez2kcQ7NGYMkqXC8MK+=hrH4iaev+0ZrQ8Q@mail.gmail.com>



Nguyen Thai Ngoc Duy <pclouds@gmail.com> 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 parsing code as it
>does not make sense to pass 4 identical parents this way.

The two heads home from HEAD...HEAD the user has on the command line.

The user is getting exactly what she asked; there is nothing to fix.