git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ralph Maalouf <ralph.maalouf@caretrx.com>
To: "'git@vger.kernel.org'" <git@vger.kernel.org>
Subject: 'git show -c' omits hunk even though file was modified from all parents
Date: Mon, 29 Jul 2019 18:20:44 +0000	[thread overview]
Message-ID: <MN2PR13MB2607878CB0C1E351B83F006BEADD0@MN2PR13MB2607.namprd13.prod.outlook.com> (raw)

Git version 2.17.1

Commit C0 contains FileA which is empty.
Both branchA and branchB point to C0.

From branchA I add the following contents to FileA (and then commit):
---
One
Two
Three


Seven
Eight
Nine
---

From branchB I add the following contents to FileA (and then commit):
---
One
Four
Three


Seven
Ten
Nine
---

Note: I use two newlines so that git merge sees two hunks.

Case1: 

From branchA I merge branchB and resolve the conflict as follows:
---
One
Two
Four
Three


Seven
Eight
Nine
---

As expected, 'git show -c' outputs the combined diff for both hunks, whereas 'git show -cc' only shows hunk1 and omits "uninteresting" hunk2.

Case2:

First I amend branchA so that the second hunk is the same as in branchB (note that the first hunk is still different between the 2 branches):
---
One
Two
Three


Seven
Ten
Nine
---

Then from branchA I merge branchB and resolve the conflict as follows (keeping only the changes from branchA):
---
One
Two
Three


Seven
Ten
Nine
---

I was expecting `git show -c` to output the combined diff for "uninteresting" hunk1, just as it did for hunk2 in case1. But it doesn't.
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.

If it's not, then the '-c' section in 'man git log' that says "it lists only files which were modified from all parents" may be a bit confusing since this requirement seems to be met.

Thanks,
Ralph



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

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-29 18:20 Ralph Maalouf [this message]
2019-07-29 18:58 ` 'git show -c' omits hunk even though file was modified from all parents Junio C Hamano
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=MN2PR13MB2607878CB0C1E351B83F006BEADD0@MN2PR13MB2607.namprd13.prod.outlook.com \
    --to=ralph.maalouf@caretrx.com \
    --cc=git@vger.kernel.org \
    /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).