From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: git <git@vger.kernel.org>
Subject: Re: BUG? git log --no-merges shows grafted merges in shallow clones
Date: Fri, 26 Feb 2016 21:05:43 +0100 [thread overview]
Message-ID: <vpqwpprqlt4.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqfuwfjl8e.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Fri, 26 Feb 2016 12:00:01 -0800")
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/
next prev parent reply other threads:[~2016-02-26 20:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 19:49 BUG? git log --no-merges shows grafted merges in shallow clones Matthieu Moy
2016-02-26 20:00 ` Junio C Hamano
2016-02-26 20:05 ` Matthieu Moy [this message]
2016-02-26 20:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqwpprqlt4.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.