Merge commits are missing from file history

[borekb]

• GitLens Version: 9.8.2
  VS Code version: Code 1.35.0 (553cfb2c2205db5f15f3ee8395bbd5cf066d357d, 2019-06-04T01:16:40.241Z)
  OS version: Darwin x64 18.6.0

This is listed by git log:

This is shown by GitLens:

Note how the merge commits are missing even though they are significant (for this specific file, merge commits had conflicts in this package.json and there's a real diff introduced by the merge commit).

[eamodio]

@borekb this is expected behavior if the File History (and Line History) are following renames -- this is because git log --follow does not play nicely with merge commits (it ends up including tons of unrelated merge commits). If you turn off rename following in the view (under the ... menu), merge commit should show up.

Is that the behavior you are seeing?

[borekb]

Oh yes, you're right. It's actually close to impossible to get git log behave correctly with --follow, it seems: https://stackoverflow.com/a/46492159/21728:

How can I display cleanly all of the commits that changed a file, following through renames?

The answer for Git is that you can't, at least not using what is built in to Git.

You can (sometimes) get a little closer by adding --cc or -c to your git log command. This makes git log look inside merge commits, doing what Git calls a combined diff. But this doesn't necessarily work anyway. [...]

Wow, what a nasty behavior :)

[eamodio]

Yeah, I've fought with trying to wrangle git log with --follow and it is just a nightmare -- it changes the behavior of so many of the options (and its not documented that it does).

[eamodio]

Closing as this is the best I can do with Git currently

[github-actions]

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.