From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Fri, 26 Feb 2016 20:05:43 GMT
Subject: Re: BUG? git log --no-merges shows grafted merges in shallow clones
Message-ID: <vpqwpprqlt4.fsf@anie.imag.fr>
In-Reply-To: <xmqqfuwfjl8e.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

> I do not think this is limited to shallow but for grafts in
> general.  

Probably yes. I happen to only use grafts in shallow clones ;-).

> cat-file is low-level to show the bare metal, but by using these
> facility you asked Git to give you an imaginary history where that
> commit is the root commit--and that is why it is shown, I think.
>
> What does it do if you say "git -c log.showRoot=false log -p"?

I get the commit without the patch:

commit c3c1cc25b27d448e9ef67b265a11be8735ff2df4 (grafted)
Author: Matthieu Moy <Matthieu.Moy@imag.fr>
Date:   Mon Aug 31 16:32:20 2015 +0200

    Merge remote-tracking branch 'edward/utf-8-email-support4'

Without "-c log.showRoot=false" I get a big patch (diff of the commit
against the empty tree).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/