git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ralph Maalouf <ralph.maalouf@caretrx.com>
Cc: "'git\@vger.kernel.org'" <git@vger.kernel.org>
Subject: Re: 'git show -c' omits hunk even though file was modified from all parents
Date: Mon, 29 Jul 2019 11:58:02 -0700	[thread overview]
Message-ID: <xmqqd0hsvfb9.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <MN2PR13MB2607878CB0C1E351B83F006BEADD0@MN2PR13MB2607.namprd13.prod.outlook.com> (Ralph Maalouf's message of "Mon, 29 Jul 2019 18:20:44 +0000")

So in short, one side has 1/2/3//7/10/9 in fileA and the other side
has 1/4/3//7/10/9, and the result of the merge is recorded as
1/2/3//7/10/9.

> I realize that this is because fileA in the merge commit's tree is
> identical to what it was in branchA prior to the merge (so the
> output of 'git show -m' only outputs the diff for one parent). But
> I'm wondering if this is the intended behavior.

Yes, that is very much intended.  We do not show hunks that match
one of the parents, and if there is no hunk to show, the path itself
is not shown.

  reply	other threads:[~2019-07-29 18:58 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-29 18:20 'git show -c' omits hunk even though file was modified from all parents Ralph Maalouf
2019-07-29 18:58 ` Junio C Hamano [this message]
2019-07-29 19:52   ` Ralph Maalouf
2019-07-29 21:46     ` Junio C Hamano
2019-07-29 22:26       ` Ralph Maalouf

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqd0hsvfb9.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=ralph.maalouf@caretrx.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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).