git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Derrick Stolee <stolee@gmail.com>
To: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: git-log on a file, and merges
Date: Fri, 2 Aug 2019 10:22:18 -0400	[thread overview]
Message-ID: <05c77291-48d1-a592-6296-d8a8bdb16b02@gmail.com> (raw)
In-Reply-To: <CAA01Csp=g08N4+S1HKAjV2a12VJNSJU0UYdAU6LW1jGWLD9SLQ@mail.gmail.com>

On 8/2/2019 5:38 AM, Piotr Krukowiecki wrote:
> Hi,
> 
> I have merged a branch into master.
> 
> When on master I do "git log -- some/file", it does not show commits
> from merged branch (which I know they changed the file).
> I have to add "--full-history" to see the commits.
> When I run "git log" (without "-- some/file") I can see the commits
> without using "--full-history".
> 
> This seems not logical, and contrary to user expectations. Harmful even ;)
> 
> Am I missing something?

Hi Piotr,

You are falling victim to an issue related to file history simplification [1]
and a (probably) bad merge. You can read more about how this can happen at [2].

When git log reaches a merge commit and one of the parents matches that path
exactly, only that parent is walked. The other is ignored. In some sense, the
other commit did not contribute changes to that file (because we only took
changes from the other parent). This makes the history look good and enables
some performance boosts.

Basically, someone must have gotten a merge conflict and used "-S ours" to
wipe away the changes from the other branch on that file. You can find that
merge by running

	git log --full-history --simplify-merges -- some/file

You will see the merge commit that un-did the change somewhere above the
commit you are expecting to see in the history.

Thanks,
-Stolee


[1] https://git-scm.com/docs/git-log#_history_simplification
[2] https://docs.microsoft.com/en-us/azure/devops/repos/git/git-log-history-simplification?view=azure-devops


  reply	other threads:[~2019-08-02 14:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-02  9:38 Piotr Krukowiecki
2019-08-02 14:22 ` Derrick Stolee [this message]
2019-08-02 19:21   ` Piotr Krukowiecki
2019-08-02 19:32     ` Junio C Hamano
2019-08-03  8:31       ` Piotr Krukowiecki

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=05c77291-48d1-a592-6296-d8a8bdb16b02@gmail.com \
    --to=stolee@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=piotr.krukowiecki@gmail.com \
    --subject='Re: git-log on a file, and merges' \
    /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

Code repositories for project(s) associated with this 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).