Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File history missing commits from other branches #1402

Closed
meikidd opened this issue Feb 26, 2021 · 16 comments
Closed

File history missing commits from other branches #1402

meikidd opened this issue Feb 26, 2021 · 16 comments
Assignees
Labels
bug Something isn't working verified ✔ Verified
Milestone

Comments

@meikidd
Copy link

meikidd commented Feb 26, 2021

Hi, thank you for this amazing extension, it makes my life a lot more productive.

GitLens Version: 11.2.1
Git Version: 2.27.0
VSCode Version: 1.53.2
OS Version: MacOS Catalina v10.15.7

Steps to produce:

  1. I created a brand new repo. Added a file "readme"
  2. Then I created new branches "branch-a" and "branch-b", then made some changes and committed, then merged them back to master branch
  3. Then I renamed "readme" to "readme.md" on master
  4. Then I opened "File history" view,
    • turned on "Toggle renames: Following", I could only see commit history on master, but the commits on other branches are missing
      image
    • turned on "Toggle renames: Not Following", I could only see the rename commit, not other branches' commit either
      image

Expect:
It should show all commits including the ones from "branch-a" and "branch-b", because they are merged to master already. I attached a screenshot of gitlab history page bellow, my expectation is something like that.

image

Thank you again for your awesome work.

@meikidd meikidd added potential-bug triage Needs to be looked at labels Feb 26, 2021
@eamodio
Copy link
Member

eamodio commented Feb 27, 2021

Can you provide access to the repo you can reproduce this on?

@eamodio eamodio added needs-more-info Needs further information, steps, details, etc. and removed triage Needs to be looked at labels Feb 27, 2021
@meikidd
Copy link
Author

meikidd commented Feb 28, 2021

Thank you for your rapid reply.

That screenshot was taken from a internal gitlab, sorry couldn't share that repo to you. But I push it to github too, https://github.com/meikidd/gitlens-file-history

On github, it shows file history differently, seems it doesn't follow rename.

@eamodio
Copy link
Member

eamodio commented Feb 28, 2021

When I have the file history set to follow, I see
image

I'm not sure why you wouldn't be seeing the merge commits. As for the difference in your GitLab screenshot and GitLens, is that I am using the --first-parent flag when following renames (as it typically provides more useful information.

With your test repo, do you not see the same as me (above) when Following is on?

@meikidd
Copy link
Author

meikidd commented Mar 1, 2021

No, it's different from yours on my side, please see the screenshot below. Please kindly let me know if there is any other settings I should follow, in order to get same history as yours.

image

@tgreen7
Copy link

tgreen7 commented Mar 7, 2021

@meikidd You can use the toggle filter to show commits from all branches. Right now you have Toggle Filter: Only Current Branch

Screen Shot 2021-03-07 at 9 49 23 AM

(This was actually a feature I requested recently)

@meikidd
Copy link
Author

meikidd commented Mar 9, 2021

@tgreen7 Thank you for replying, but it doesn't work on my side, please see the attached screenshot.

  1. Toggle Renames: Not Following, Toggle Filter: All Branches
    image

  2. Toggle Renames: Not Following, Toggle Filter: Only Current Branch
    image

  3. Toggle Renames: Following, Toggle Filter: Only Current Branch
    image

@github-actions github-actions bot added the inactive Issue has not had recent required feedback label Mar 17, 2021
@eamodio eamodio reopened this Mar 29, 2021
@eamodio eamodio removed inactive Issue has not had recent required feedback needs-more-info Needs further information, steps, details, etc. labels Mar 29, 2021
@gitkraken gitkraken deleted a comment from github-actions bot Mar 29, 2021
@gitkraken gitkraken deleted a comment from github-actions bot Mar 29, 2021
@eamodio
Copy link
Member

eamodio commented Mar 29, 2021

@meikidd Do you have anything odd in your ~/.gitconfig or in the .git/config file in that repo?

@meikidd
Copy link
Author

meikidd commented Mar 29, 2021

Please see my .git/config:

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
	ignorecase = true
	precomposeunicode = true
[remote "origin"]
	url = ****
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[branch "fix/9694-websocket-close"]
	remote = origin
	merge = refs/heads/fix/9694-websocket-close
[branch "test"]
	remote = origin
	merge = refs/heads/test
[user]
	name = ***
	email = ***
[branch "feature/9505-game-list"]
	remote = origin
	merge = refs/heads/feature/9505-game-list
[pull]
	rebase = false

And ~/.gitconfig:

[user]
	name = meikidd
	email = meikidd@gmail.com
[gui]
	recentrepo = /Users/meiqg/workspace/new-spark
	recentrepo = /Users/meiqg/workspace/test-ssr/monorepo
[core]
	excludesfile = /Users/meiqg/.gitignore_global
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path =
[mergetool "sourcetree"]
	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true

@eamodio
Copy link
Member

eamodio commented Apr 7, 2021

Can you please enable output channel logging by setting "gitlens.outputLevel": "debug" in your settings?

This will enable logging to the GitLens channel in the Output pane. Once enabled, please reproduce the issue, and attach the log from the GitLens channel.

Thanks!

@eamodio eamodio added the needs-more-info Needs further information, steps, details, etc. label Apr 7, 2021
@meikidd
Copy link
Author

meikidd commented Apr 8, 2021

Thanks for replying, pls see the logs below.

  1. Toggle Renames: Not Following, Toggle Filter: All Branches
[2021-04-08 02:16:03:370] [293] FileHistoryView.refresh — true
[2021-04-08 02:16:03:370] [294] FileHistoryTrackerNode.refresh — true
[2021-04-08 02:16:03:371] [295] FileHistoryTrackerNode.resetChild
[2021-04-08 02:16:03:371] [296] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).dispose
[2021-04-08 02:16:03:371] [297] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).unsubscribe
[2021-04-08 02:16:03:371] [296] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).dispose completed • 0 ms
[2021-04-08 02:16:03:371] [295] FileHistoryTrackerNode.resetChild completed • 0 ms
[2021-04-08 02:16:03:371] [298] GitUri.fromUri — $=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md)
[2021-04-08 02:16:03:371] [299] GitService.getRepoPath — g=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md)
[2021-04-08 02:16:03:371] [29a] GitService.getRepository — g=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md), A={"skipCacheUpdate":true}
[2021-04-08 02:16:03:372] [29b] GitService.findRepositoryForPath — g=count=1, A=/Users/meiqg/github/gitlens-file-history/readme.md, N=false
[2021-04-08 02:16:03:372] [29b] GitService.findRepositoryForPath completed • 0 ms
[2021-04-08 02:16:03:372] [297] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).unsubscribe completed • 1 ms
[2021-04-08 02:16:03:372] [29c] GitService.isTracked returned true • 0 ms — g=/Users/meiqg/github/gitlens-file-history/readme.md, A=/Users/meiqg/github/gitlens-file-history, N={"skipCacheUpdate":true}
[2021-04-08 02:16:03:372] [29a] GitService.getRepository returned /Users/meiqg/github/gitlens-file-history • 1 ms
[2021-04-08 02:16:03:372] [299] GitService.getRepoPath returned /Users/meiqg/github/gitlens-file-history • 1 ms
[2021-04-08 02:16:03:372] [298] GitUri.fromUri returned GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history) • 1 ms
[2021-04-08 02:16:03:372] [29d] FileHistoryTrackerNode.resetChild
[2021-04-08 02:16:03:372] [29d] FileHistoryTrackerNode.resetChild completed • 0 ms
[2021-04-08 02:16:03:372] [294] FileHistoryTrackerNode.refresh returned false, uri=GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history) • 1 ms
[2021-04-08 02:16:03:372] [29e] FileHistoryView.triggerNodeChange
[2021-04-08 02:16:03:372] [29e] FileHistoryView.triggerNodeChange completed • 0 ms
[2021-04-08 02:16:03:372] [293] FileHistoryView.refresh completed • 2 ms
[2021-04-08 02:16:03:378] [29f] FileHistoryTrackerNode.ensureSubscription
[2021-04-08 02:16:03:378] [2a0] GitService.getBranch — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:16:03:378] [2a1] GitService.getBranches — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:16:03:378] [29f] FileHistoryTrackerNode.ensureSubscription completed • 0 ms
[2021-04-08 02:16:03:378] [2a1] GitService.getBranches completed • 0 ms
[2021-04-08 02:16:03:378] [2a0] GitService.getBranch completed • 0 ms
[2021-04-08 02:16:03:378] [2a2] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).ensureSubscription
[2021-04-08 02:16:03:378] [2a3] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).subscribe
[2021-04-08 02:16:03:378] [2a4] GitService.getRepository — g=GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history)
[2021-04-08 02:16:03:378] [2a5] GitService.getBranchAheadRange — g=master
[2021-04-08 02:16:03:378] [2a6] GitService.getBranches — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:16:03:379] [2a6] GitService.getBranches completed • 0 ms
[2021-04-08 02:16:03:379] [2a4] GitService.getRepository returned /Users/meiqg/github/gitlens-file-history • 0 ms
[2021-04-08 02:16:03:379] [2a5] GitService.getBranchAheadRange completed • 0 ms
[2021-04-08 02:16:03:379] [2a7] GitService.getLogForFile — g=/Users/meiqg/github/gitlens-file-history, A=/Users/meiqg/github/gitlens-file-history/readme.md, N={"limit":40}
[2021-04-08 02:16:03:379] [2a8] GitService.getStatusForFile — g=/Users/meiqg/github/gitlens-file-history, A=/Users/meiqg/github/gitlens-file-history/readme.md
[2021-04-08 02:16:03:385] [2a3] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).subscribe completed • 6 ms
[2021-04-08 02:16:03:385] [2a2] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).ensureSubscription completed • 7 ms
[2021-04-08 02:16:03:386] [2a7] GitService.getLogForFile Cache hit: 'log:all:n40:follow'
[2021-04-08 02:16:03:386] [2a7] GitService.getLogForFile completed • 6 ms
[2021-04-08 02:16:03:394] [/Users/meiqg/github/gitlens-file-history] git status --porcelain=v2 --find-renames -- readme.md • 14 ms 
[2021-04-08 02:16:03:394] [2a9] GitStatusParser.parse completed • 0 ms
[2021-04-08 02:16:03:394] [2a8] GitService.getStatusForFile completed • 15 ms
[2021-04-08 02:16:07:707] [2aa] FileHistoryTrackerNode.onActiveEditorChanged
[2021-04-08 02:16:07:707] [2ab] FileHistoryTrackerNode.triggerChange
[2021-04-08 02:16:07:707] [2ac] FileHistoryTrackerNode.triggerChange — false, false
[2021-04-08 02:16:07:707] [2ad] FileHistoryView.refreshNode — x=FileHistoryTrackerNode, j=false, h=false
[2021-04-08 02:16:07:707] [2ae] FileHistoryTrackerNode.refresh — false
[2021-04-08 02:16:07:707] [2aa] FileHistoryTrackerNode.onActiveEditorChanged completed • 0 ms
[2021-04-08 02:16:07:707] [2ae] FileHistoryTrackerNode.refresh returned true • 0 ms
[2021-04-08 02:16:07:707] [2ad] FileHistoryView.refreshNode completed • 0 ms
[2021-04-08 02:16:07:707] [2ac] FileHistoryTrackerNode.triggerChange completed • 0 ms
[2021-04-08 02:16:07:707] [2ab] FileHistoryTrackerNode.triggerChange completed • 0 ms
[2021-04-08 02:16:07:707] [2af] FileHistoryTrackerNode.onActiveEditorChanged
[2021-04-08 02:16:07:707] [2b0] FileHistoryTrackerNode.triggerChange
[2021-04-08 02:16:07:708] [2b1] FileHistoryTrackerNode.triggerChange — false, false
[2021-04-08 02:16:07:708] [2b2] FileHistoryView.refreshNode — x=FileHistoryTrackerNode, j=false, h=false
[2021-04-08 02:16:07:708] [2b3] FileHistoryTrackerNode.refresh — false
[2021-04-08 02:16:07:708] [2af] FileHistoryTrackerNode.onActiveEditorChanged completed • 0 ms
[2021-04-08 02:16:07:708] [2b3] FileHistoryTrackerNode.refresh returned true • 0 ms
[2021-04-08 02:16:07:708] [2b2] FileHistoryView.refreshNode completed • 0 ms
[2021-04-08 02:16:07:708] [2b1] FileHistoryTrackerNode.triggerChange completed • 0 ms
[2021-04-08 02:16:07:708] [2b0] FileHistoryTrackerNode.triggerChange completed • 0 ms
  1. Toggle Renames: Not Following, Toggle Filter: Only Current Branch
[2021-04-08 02:16:30:520] [2d9] FileHistoryView.refresh — true
[2021-04-08 02:16:30:521] [2da] FileHistoryTrackerNode.refresh — true
[2021-04-08 02:16:30:521] [2db] FileHistoryTrackerNode.resetChild
[2021-04-08 02:16:30:521] [2dc] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).dispose
[2021-04-08 02:16:30:521] [2dd] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).unsubscribe
[2021-04-08 02:16:30:521] [2dc] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).dispose completed • 0 ms
[2021-04-08 02:16:30:521] [2db] FileHistoryTrackerNode.resetChild completed • 0 ms
[2021-04-08 02:16:30:521] [2de] GitUri.fromUri — $=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md)
[2021-04-08 02:16:30:521] [2df] GitService.getRepoPath — g=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md)
[2021-04-08 02:16:30:521] [2e0] GitService.getRepository — g=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md), A={"skipCacheUpdate":true}
[2021-04-08 02:16:30:521] [2e1] FileHistoryView.resetNodeLastKnownLimit completed • 0 ms — x=FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md))
[2021-04-08 02:16:30:522] [2e2] GitService.findRepositoryForPath — g=count=1, A=/Users/meiqg/github/gitlens-file-history/readme.md, N=false
[2021-04-08 02:16:30:522] [2e2] GitService.findRepositoryForPath completed • 0 ms
[2021-04-08 02:16:30:522] [2dd] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).unsubscribe completed • 1 ms
[2021-04-08 02:16:30:522] [2e3] GitService.isTracked returned true • 0 ms — g=/Users/meiqg/github/gitlens-file-history/readme.md, A=/Users/meiqg/github/gitlens-file-history, N={"skipCacheUpdate":true}
[2021-04-08 02:16:30:522] [2e0] GitService.getRepository returned /Users/meiqg/github/gitlens-file-history • 1 ms
[2021-04-08 02:16:30:522] [2df] GitService.getRepoPath returned /Users/meiqg/github/gitlens-file-history • 1 ms
[2021-04-08 02:16:30:522] [2de] GitUri.fromUri returned GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history) • 1 ms
[2021-04-08 02:16:30:523] [2e4] FileHistoryTrackerNode.resetChild
[2021-04-08 02:16:30:523] [2e4] FileHistoryTrackerNode.resetChild completed • 0 ms
[2021-04-08 02:16:30:523] [2da] FileHistoryTrackerNode.refresh returned false, uri=GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history) • 2 ms
[2021-04-08 02:16:30:523] [2e5] FileHistoryView.triggerNodeChange
[2021-04-08 02:16:30:523] [2e5] FileHistoryView.triggerNodeChange completed • 0 ms
[2021-04-08 02:16:30:523] [2d9] FileHistoryView.refresh completed • 2 ms
[2021-04-08 02:16:30:528] [2e6] FileHistoryTrackerNode.ensureSubscription
[2021-04-08 02:16:30:528] [2e7] GitService.getBranch — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:16:30:528] [2e8] GitService.getBranches — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:16:30:528] [2e6] FileHistoryTrackerNode.ensureSubscription completed • 0 ms
[2021-04-08 02:16:30:528] [2e8] GitService.getBranches completed • 0 ms
[2021-04-08 02:16:30:528] [2e7] GitService.getBranch completed • 0 ms
[2021-04-08 02:16:30:528] [2e9] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).ensureSubscription
[2021-04-08 02:16:30:528] [2ea] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).subscribe
[2021-04-08 02:16:30:528] [2eb] GitService.getRepository — g=GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history)
[2021-04-08 02:16:30:529] [2ec] GitService.getBranchAheadRange — g=master
[2021-04-08 02:16:30:529] [2ed] GitService.getBranches — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:16:30:529] [2ed] GitService.getBranches completed • 0 ms
[2021-04-08 02:16:30:529] [2eb] GitService.getRepository returned /Users/meiqg/github/gitlens-file-history • 0 ms
[2021-04-08 02:16:30:529] [2ec] GitService.getBranchAheadRange completed • 0 ms
[2021-04-08 02:16:30:529] [2ee] GitService.getLogForFile — g=/Users/meiqg/github/gitlens-file-history, A=/Users/meiqg/github/gitlens-file-history/readme.md, N={"limit":40}
[2021-04-08 02:16:30:530] [2ef] GitService.getStatusForFile — g=/Users/meiqg/github/gitlens-file-history, A=/Users/meiqg/github/gitlens-file-history/readme.md
[2021-04-08 02:16:30:535] [2ea] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).subscribe completed • 7 ms
[2021-04-08 02:16:30:536] [2e9] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).ensureSubscription completed • 7 ms
[2021-04-08 02:16:30:536] [2ee] GitService.getLogForFile Cache hit: 'log:n40'
[2021-04-08 02:16:30:536] [2ee] GitService.getLogForFile completed • 6 ms
[2021-04-08 02:16:30:544] [/Users/meiqg/github/gitlens-file-history] git status --porcelain=v2 --find-renames -- readme.md • 14 ms 
[2021-04-08 02:16:30:544] [2f0] GitStatusParser.parse completed • 0 ms
[2021-04-08 02:16:30:545] [2ef] GitService.getStatusForFile completed • 14 ms
[2021-04-08 02:16:31:930] [2f1] FileHistoryTrackerNode.onActiveEditorChanged
[2021-04-08 02:16:31:930] [2f2] FileHistoryTrackerNode.triggerChange
[2021-04-08 02:16:31:930] [2f3] FileHistoryTrackerNode.triggerChange — false, false
[2021-04-08 02:16:31:930] [2f4] FileHistoryView.refreshNode — x=FileHistoryTrackerNode, j=false, h=false
[2021-04-08 02:16:31:930] [2f5] FileHistoryTrackerNode.refresh — false
[2021-04-08 02:16:31:931] [2f1] FileHistoryTrackerNode.onActiveEditorChanged completed • 0 ms
[2021-04-08 02:16:31:931] [2f5] FileHistoryTrackerNode.refresh returned true • 0 ms
[2021-04-08 02:16:31:931] [2f4] FileHistoryView.refreshNode completed • 0 ms
[2021-04-08 02:16:31:931] [2f3] FileHistoryTrackerNode.triggerChange completed • 0 ms
[2021-04-08 02:16:31:931] [2f2] FileHistoryTrackerNode.triggerChange completed • 1 ms
[2021-04-08 02:16:31:932] [2f6] FileHistoryTrackerNode.onActiveEditorChanged
[2021-04-08 02:16:31:932] [2f7] FileHistoryTrackerNode.triggerChange
[2021-04-08 02:16:31:932] [2f8] FileHistoryTrackerNode.triggerChange — false, false
[2021-04-08 02:16:31:932] [2f9] FileHistoryView.refreshNode — x=FileHistoryTrackerNode, j=false, h=false
[2021-04-08 02:16:31:932] [2fa] FileHistoryTrackerNode.refresh — false
[2021-04-08 02:16:31:932] [2f6] FileHistoryTrackerNode.onActiveEditorChanged completed • 0 ms
[2021-04-08 02:16:31:932] [2fa] FileHistoryTrackerNode.refresh returned true • 0 ms
[2021-04-08 02:16:31:932] [2f9] FileHistoryView.refreshNode completed • 0 ms
[2021-04-08 02:16:31:932] [2f8] FileHistoryTrackerNode.triggerChange completed • 0 ms
[2021-04-08 02:16:31:932] [2f7] FileHistoryTrackerNode.triggerChange completed • 0 ms
  1. Toggle Renames: Following, Toggle Filter: Only Current Branch
[2021-04-08 02:13:30:819] [215] FileHistoryView.refresh — true
[2021-04-08 02:13:30:819] [216] FileHistoryTrackerNode.refresh — true
[2021-04-08 02:13:30:819] [217] FileHistoryTrackerNode.resetChild
[2021-04-08 02:13:30:819] [218] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).dispose
[2021-04-08 02:13:30:819] [219] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).unsubscribe
[2021-04-08 02:13:30:819] [218] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).dispose completed • 0 ms
[2021-04-08 02:13:30:819] [217] FileHistoryTrackerNode.resetChild completed • 0 ms
[2021-04-08 02:13:30:819] [21a] GitUri.fromUri — $=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md)
[2021-04-08 02:13:30:819] [21b] GitService.getRepoPath — g=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md)
[2021-04-08 02:13:30:819] [21c] GitService.getRepository — g=Uri(file:///Users/meiqg/github/gitlens-file-history/readme.md), A={"skipCacheUpdate":true}
[2021-04-08 02:13:30:821] [21d] GitService.findRepositoryForPath — g=count=1, A=/Users/meiqg/github/gitlens-file-history/readme.md, N=false
[2021-04-08 02:13:30:821] [21d] GitService.findRepositoryForPath completed • 0 ms
[2021-04-08 02:13:30:821] [219] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).unsubscribe completed • 2 ms
[2021-04-08 02:13:30:821] [21e] GitService.isTracked returned true • 0 ms — g=/Users/meiqg/github/gitlens-file-history/readme.md, A=/Users/meiqg/github/gitlens-file-history, N={"skipCacheUpdate":true}
[2021-04-08 02:13:30:821] [21c] GitService.getRepository returned /Users/meiqg/github/gitlens-file-history • 2 ms
[2021-04-08 02:13:30:821] [21b] GitService.getRepoPath returned /Users/meiqg/github/gitlens-file-history • 2 ms
[2021-04-08 02:13:30:822] [21a] GitUri.fromUri returned GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history) • 2 ms
[2021-04-08 02:13:30:822] [21f] FileHistoryTrackerNode.resetChild
[2021-04-08 02:13:30:822] [21f] FileHistoryTrackerNode.resetChild completed • 0 ms
[2021-04-08 02:13:30:822] [216] FileHistoryTrackerNode.refresh returned false, uri=GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history) • 2 ms
[2021-04-08 02:13:30:822] [220] FileHistoryView.triggerNodeChange
[2021-04-08 02:13:30:822] [220] FileHistoryView.triggerNodeChange completed • 0 ms
[2021-04-08 02:13:30:822] [215] FileHistoryView.refresh completed • 3 ms
[2021-04-08 02:13:30:826] [221] FileHistoryTrackerNode.ensureSubscription
[2021-04-08 02:13:30:826] [222] GitService.getBranch — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:13:30:826] [223] GitService.getBranches — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:13:30:826] [221] FileHistoryTrackerNode.ensureSubscription completed • 0 ms
[2021-04-08 02:13:30:826] [223] GitService.getBranches completed • 0 ms
[2021-04-08 02:13:30:826] [222] GitService.getBranch completed • 0 ms
[2021-04-08 02:13:30:826] [224] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).ensureSubscription
[2021-04-08 02:13:30:826] [225] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).subscribe
[2021-04-08 02:13:30:827] [226] GitService.getRepository — g=GitUri(file:///Users/meiqg/github/gitlens-file-history/readme.md repoPath=/Users/meiqg/github/gitlens-file-history)
[2021-04-08 02:13:30:827] [227] GitService.getBranchAheadRange — g=master
[2021-04-08 02:13:30:827] [228] GitService.getBranches — g=/Users/meiqg/github/gitlens-file-history
[2021-04-08 02:13:30:827] [228] GitService.getBranches completed • 0 ms
[2021-04-08 02:13:30:827] [226] GitService.getRepository returned /Users/meiqg/github/gitlens-file-history • 0 ms
[2021-04-08 02:13:30:827] [227] GitService.getBranchAheadRange completed • 0 ms
[2021-04-08 02:13:30:827] [229] GitService.getLogForFile — g=/Users/meiqg/github/gitlens-file-history, A=/Users/meiqg/github/gitlens-file-history/readme.md, N={"limit":40}
[2021-04-08 02:13:30:827] [22a] GitService.getStatusForFile — g=/Users/meiqg/github/gitlens-file-history, A=/Users/meiqg/github/gitlens-file-history/readme.md
[2021-04-08 02:13:30:833] [225] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).subscribe completed • 6 ms
[2021-04-08 02:13:30:833] [224] FileHistoryNode(gitlens:repository(/Users/meiqg/github/gitlens-file-history):history:file(file:///Users/meiqg/github/gitlens-file-history/readme.md)).ensureSubscription completed • 6 ms
[2021-04-08 02:13:30:833] [229] GitService.getLogForFile Cache hit: 'log:n40:follow'
[2021-04-08 02:13:30:833] [229] GitService.getLogForFile completed • 6 ms
[2021-04-08 02:13:30:841] [/Users/meiqg/github/gitlens-file-history] git status --porcelain=v2 --find-renames -- readme.md • 13 ms 
[2021-04-08 02:13:30:841] [22b] GitStatusParser.parse completed • 0 ms
[2021-04-08 02:13:30:841] [22a] GitService.getStatusForFile completed • 13 ms
[2021-04-08 02:13:35:414] [22c] FileHistoryTrackerNode.onActiveEditorChanged
[2021-04-08 02:13:35:414] [22d] FileHistoryTrackerNode.triggerChange
[2021-04-08 02:13:35:414] [22e] FileHistoryTrackerNode.triggerChange — false, false
[2021-04-08 02:13:35:414] [22f] FileHistoryView.refreshNode — x=FileHistoryTrackerNode, j=false, h=false
[2021-04-08 02:13:35:414] [230] FileHistoryTrackerNode.refresh — false
[2021-04-08 02:13:35:414] [22c] FileHistoryTrackerNode.onActiveEditorChanged completed • 0 ms
[2021-04-08 02:13:35:414] [230] FileHistoryTrackerNode.refresh returned true • 0 ms
[2021-04-08 02:13:35:415] [22f] FileHistoryView.refreshNode completed • 0 ms
[2021-04-08 02:13:35:415] [22e] FileHistoryTrackerNode.triggerChange completed • 0 ms
[2021-04-08 02:13:35:415] [22d] FileHistoryTrackerNode.triggerChange completed • 1 ms

@eamodio
Copy link
Member

eamodio commented Apr 8, 2021

Can you try to see if the issue is still reproducible in the insiders edition?

You can install the insiders edition from here. Be sure to disable/uninstall the stable version of GitLens first.

If so, can you then post the output of the following git command on your provided repo: https://github.com/meikidd/gitlens-file-history

git log --format="%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e" -n41 --follow --first-parent --numstat --summary -- readme.md

@meikidd
Copy link
Author

meikidd commented Apr 8, 2021

Yes it is still reproducible in insiders edition.

Please see the git command output below. And I also attached the output of without --first-parent.

meiqg:gitlens-file-history$ (master) git --version
git version 2.27.0
meiqg:gitlens-file-history$ (master) git log --format="%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e" -n41 --follow --first-parent --numstat --summary -- readme.md
</f>
<r> 28034e199ad797528a31bcef67473e741c346141
<a> meikidd
<e> meikidd@gmail.com
<d> 1614331922
<c> 1614331922
<p> 67a7590b5af23afb8026857f1761660256e78887
<s>
rename readme -> readme.md

</s>
<f>

0       0       readme => readme.md
 rename readme => readme.md (100%)
</f>
<r> a78f22da5775ac6ba7d1011fa484cca5fcf42d3c
<a> meikidd
<e> meikidd@gmail.com
<d> 1614331773
<c> 1614331773
<p>
<s>
init commit

</s>
<f>

1       0       readme
 create mode 100644 readme

WIthout --first-parent:

meiqg:gitlens-file-history$ (master) git log --format="%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e" -n41 --follow --numstat --summary -- readme.md
</f>
<r> 28034e199ad797528a31bcef67473e741c346141
<a> meikidd
<e> meikidd@gmail.com
<d> 1614331922
<c> 1614331922
<p> 67a7590b5af23afb8026857f1761660256e78887
<s>
rename readme -> readme.md

</s>
<f>

0       0       readme => readme.md
 rename readme => readme.md (100%)
</f>
<r> b8133d65bae2dec6608b704e8a30b3844d43e1f8
<a> meikidd
<e> meikidd@gmail.com
<d> 1614331866
<c> 1614331866
<p> ff209cd9970dc13542ed85cd74425c484d62dcf8
<s>
commit, branch b

</s>
<f>

1       0       readme
</f>
<r> 152bcf89b8a2d1c7f1a0115452a5360d47faa68d
<a> meikidd
<e> meikidd@gmail.com
<d> 1614331819
<c> 1614331819
<p> a78f22da5775ac6ba7d1011fa484cca5fcf42d3c
<s>
commit, branch a

</s>
<f>

2       1       readme
</f>
<r> a78f22da5775ac6ba7d1011fa484cca5fcf42d3c
<a> meikidd
<e> meikidd@gmail.com
<d> 1614331773
<c> 1614331773
<p>
<s>
init commit

</s>
<f>

1       0       readme
 create mode 100644 readme

@github-actions github-actions bot added the inactive Issue has not had recent required feedback label Apr 16, 2021
@eamodio eamodio removed inactive Issue has not had recent required feedback needs-more-info Needs further information, steps, details, etc. labels Apr 18, 2021
@gitkraken gitkraken deleted a comment from github-actions bot Apr 18, 2021
@eamodio eamodio added bug Something isn't working and removed potential-bug labels Apr 18, 2021
@eamodio eamodio self-assigned this Apr 18, 2021
@eamodio eamodio added this to the Soon™ milestone Apr 18, 2021
@eamodio
Copy link
Member

eamodio commented Apr 18, 2021

I think I have finally figured this one out. Its our difference in Git versions. In Git >= 2.29.0 --first-parent implies -m, so adding -m on to the command with your Git version provides the same output as I am seeing. So I will always pass -m when using --first-parent.

@eamodio eamodio added pending-release Resolved but not yet released to the stable edition needs-verification Request for community verification labels Apr 18, 2021
@eamodio
Copy link
Member

eamodio commented Apr 18, 2021

Can you please verify this fix in tomorrow's insiders edition?

You can install the insiders edition from here. Be sure to disable/uninstall the stable version of GitLens first.

@meikidd
Copy link
Author

meikidd commented Apr 19, 2021

I installed the new insider version and it works for me. Thank you so much for your effort.

image

@eamodio eamodio added verified ✔ Verified and removed needs-verification Request for community verification labels Apr 19, 2021
@github-actions
Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 20, 2021
@eamodio eamodio modified the milestones: Soon™, Shipped Jun 14, 2021
@eamodio eamodio removed the pending-release Resolved but not yet released to the stable edition label Jun 14, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working verified ✔ Verified
Projects
None yet
Development

No branches or pull requests

3 participants