GitLens Inspect "File history" is missing entries after "git mv"

[agobeaux]

Description

I cannot share the repository or a screenshot of the repository, but steps are easily reproducible.
If a file a.txt was renamed to b.txt using git mv a.txt b.txt, the file history of GitLens inspect will not show the full history, only the history of b.txt.
However, when looking at the line history, the full history is there (a.txt + b.txt).

Steps to reproduce:

• Checkout any repository
• Do a git mv command on any file
• Make a commit containing the renaming
• Check the line and file history of the new file

GitLens Version

14.1.1

VS Code Version

Version: 1.78.2
Commit: b3e4e68a0bc097f0ae7907b217c1119af9e03435
Date: 2023-05-10T14:44:45.204Z (2 mos ago)
Electron: 22.5.2
Chromium: 108.0.5359.215
Node.js: 16.17.1
V8: 10.8.168.25-electron.0

Git Version

git version 2.40.1

Logs, Screenshots, Screen Captures, etc

No response

[Jollus174]

I can confirm this is happening on my machine as well.

GitLens Version

14.2.0

VS Code Version

Version: 1.81.0 (user setup)
Commit: 6445d93c81ebe42c4cbd7a60712e0b17d9463e97
Date: 2023-08-02T12:37:13.485Z
Electron: 22.3.18
ElectronBuildId: 22689846
Chromium: 108.0.5359.215
Node.js: 16.17.1
V8: 10.8.168.25-electron.0
OS: Windows_NT x64 10.0.19045

Git Version

2.41.0

The Toggle Follow Renames option in also disabled is my VS Code.

The git blame option does seem to show line changes, but it no longer seems possible to follow File History renames in the left-side window.

Following history via the arrows in the top-right still works, but attempting to open a commit that was part of a renamed file will fail.

[Jollus174]

Actually, I think I've figured it out. After making sure that this is set to Toggle Filter: All Branches, then Follow Renames is enabled once more and renamed files once again come up in the left-side window.

[ili101]

Setting Toggle Filter: All Branches I only get commits down until the last merge (so if I'm on master I see only down until the last "fix" branch merge).
And as you mentioned without it the option is unavailable.
Workaround is to use other extension like "Git History" or simply do git log --follow ./path/to/file

[eamodio]

Since it looks like newer version of Git now support the --all flag in conjunction with --follow, I've removed that limitation in GitLens, and you can now choose to show the history for all branches while still following renames.

We've also changed some defaults and added a new options (and renamed others) to the File History view in the latest pre-release edition of GitLens. We now follow renames by default, which you can still toggle it on/off, and we hide merge commits by default, which can also be toggled it on/off.

Can you please verify this fix in tomorrow's (v2023.10.13xx) pre-release edition of GitLens? Thank you so much!

You can switch to the pre-release edition of GitLens, by clicking on the "Switch to Pre-Release version of this extension" from the Extensions view.

[axosoft-ramint]

Verified fix using repro steps in the original post.

[Jollus174]

Also verified here. The options are much more clear now as well, thanks for that! This also resolves another small issue I was having where merge commits would always show up in the File History. 🎉

[Dew0Tgx]

great thank you so much Op za 14 okt 2023 om 04:01 schreef Joel Sweetman ***@***.***>

…

Also verified here. The options are much more clear now as well, thanks for that! This also resolves another small issue I was having where merge commits would always show up in the File History. 🎉 [image: image] <https://user-images.githubusercontent.com/30223207/275111052-d01fefc5-8ca1-4e7d-a6b8-7938db356caa.png> — Reply to this email directly, view it on GitHub <#2828 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ANQ4SXZ5YK7HOOHE4GJPUGLX7HXAJAVCNFSM6AAAAAA2VIJF3CVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTONRSGQ4DCNZTG4> . You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>

[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.