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

Merge commit shows only the changes from the last commit on those files #756

Open
sarbuandreidaniel opened this issue May 28, 2019 · 7 comments

Comments

Projects
None yet
2 participants
@sarbuandreidaniel
Copy link

commented May 28, 2019

  • GitLens Version: 9.8.1
  • VSCode Version: 1.34.0
  • OS Version: Ubuntu 18.04

Steps to Reproduce:

  1. Do a merge with --no-ff flag with a branch that has at least 2 new commits
  2. Go to GitLens extension
  3. Select the repository and the branch where the merge was made

At this point, you should be able to see all the changes from both commits (the new ones), but instead you are seeing only the changes from the last commit on those files. This was working just fine a few days ago. I think this is happening since the last extension update.

@eamodio

This comment has been minimized.

Copy link
Owner

commented Jun 5, 2019

@sarbuandreidaniel I'm not sure I'm understanding the issue.

Here's what I did:

  1. Created foo from develop
  2. Committed wip1 to foo with 1 change
  3. Committed wip2 to foo with 1 change
  4. Merged (with --no-ff) foo into develop

And here is what I see:
image

What are you seeing that is the issue?

@sarbuandreidaniel

This comment has been minimized.

Copy link
Author

commented Jun 6, 2019

@eamodio click on the launch.json file (from the Merge message) and let me know if you can see the diff with both changes made on that file.

@eamodio eamodio self-assigned this Jun 7, 2019

@eamodio eamodio added this to the Soon™ milestone Jun 7, 2019

eamodio added a commit that referenced this issue Jun 7, 2019

Fixes #756 - use --first-parent for merge commits
Fixes issue with --numstat changes
Fixes issue with walking back too far

@eamodio eamodio closed this in 670212b Jun 11, 2019

@sarbuandreidaniel

This comment has been minimized.

Copy link
Author

commented Jun 13, 2019

@eamodio this is still broken. Now it shows to many diffs.

This is the commit diff:
Screenshot from 2019-06-13 14-08-39

And this is the merge diff:
Screenshot from 2019-06-13 14-09-52

@eamodio

This comment has been minimized.

Copy link
Owner

commented Jun 13, 2019

@sarbuandreidaniel can you provide logs please? Thanks!

@sarbuandreidaniel

This comment has been minimized.

Copy link
Author

commented Jun 14, 2019

I'm not sure which logs do you need. Can you please let me know how can I provide them ?

@eamodio

This comment has been minimized.

Copy link
Owner

commented Jun 14, 2019

Please enable output channel logging by setting "gitlens.outputLevel": "debug" in your settings.json. This will enable logging to the GitLens channel in the Output pane. Once enabled, please reproduce the issue (if possible) and attach the log lines from the GitLens channel.

@sarbuandreidaniel

This comment has been minimized.

Copy link
Author

commented Jun 14, 2019

Here you go:

[2019-06-14 06:04:46:309] [175] GitService.getPreviousUri — e=/home/andrei/Projects/movavi-new-cart, t=GitUri(file:///home/andrei/Projects/movavi-new-cart/scripts/cart/ava_cart_init.js repoPath=/home/andrei/Projects/movavi-new-cart sha=f00561c2d3d523912edadd315222cae810c41388), i=f00561c2d3d523912edadd315222cae810c41388, o=0, r=undefined, n=true
[2019-06-14 06:04:46:359] [/home/andrei/Projects/movavi-new-cart] git log --format=%x3cr%x3e%x20%H -n2 --follow --first-parent --name-status f00561c2d3d523912edadd315222cae810c41388 -- scripts/cart/ava_cart_init.js • 50 ms 
[2019-06-14 06:04:46:360] [176] GitLogParser.parseSimple
[2019-06-14 06:04:46:360] [176] GitLogParser.parseSimple completed • 0 ms
[2019-06-14 06:04:46:360] [175] GitService.getPreviousUri completed • 51 ms
[2019-06-14 06:04:46:360] [174] GitService.getPreviousDiffUris completed • 52 ms
[2019-06-14 06:04:46:360] [177] GitService.resolveReference — e=/home/andrei/Projects/movavi-new-cart, t=fcfd4e639dea496359688aaa4ead3bcc4c2d52df, i=Uri(file:///home/andrei/Projects/movavi-new-cart/scripts/cart/ava_cart_init.js)
[2019-06-14 06:04:46:373] [/home/andrei/Projects/movavi-new-cart] git cat-file -e fcfd4e639dea496359688aaa4ead3bcc4c2d52df:./scripts/cart/ava_cart_init.js • 12 ms 
[2019-06-14 06:04:46:373] [177] GitService.resolveReference completed • 12 ms
[2019-06-14 06:04:46:373] [178] GitService.resolveReference — e=/home/andrei/Projects/movavi-new-cart, t=f00561c2d3d523912edadd315222cae810c41388, i=Uri(file:///home/andrei/Projects/movavi-new-cart/scripts/cart/ava_cart_init.js)
[2019-06-14 06:04:46:384] [/home/andrei/Projects/movavi-new-cart] git cat-file -e f00561c2d3d523912edadd315222cae810c41388:./scripts/cart/ava_cart_init.js • 10 ms 
[2019-06-14 06:04:46:384] [178] GitService.resolveReference completed • 10 ms
[2019-06-14 06:04:46:384] [179] GitService.getFileStatusForCommit — e=/home/andrei/Projects/movavi-new-cart, t=/home/andrei/Projects/movavi-new-cart/scripts/cart/ava_cart_init.js, i=f00561c2d3d523912edadd315222cae810c41388
[2019-06-14 06:04:46:395] [/home/andrei/Projects/movavi-new-cart] git show --name-status --format= f00561c2d3d523912edadd315222cae810c41388 -- /home/andrei/Projects/movavi-new-cart/scripts/cart/ava_cart_init.js • 10 ms 
[2019-06-14 06:04:46:395] [179] GitService.getFileStatusForCommit completed • 10 ms
[2019-06-14 06:04:46:395] [17a] GitService.getVersionedUri — e=/home/andrei/Projects/movavi-new-cart, t=/home/andrei/Projects/movavi-new-cart/scripts/cart/ava_cart_init.js, i=fcfd4e639dea496359688aaa4ead3bcc4c2d52df
[2019-06-14 06:04:46:395] [17b] GitService.getVersionedUri — e=/home/andrei/Projects/movavi-new-cart, t=/home/andrei/Projects/movavi-new-cart/scripts/cart/ava_cart_init.js, i=f00561c2d3d523912edadd315222cae810c41388
[2019-06-14 06:04:46:395] [17a] GitService.getVersionedUri completed • 0 ms
[2019-06-14 06:04:46:395] [17b] GitService.getVersionedUri completed • 0 ms
[2019-06-14 06:04:46:403] [17c] GitService.getVersionedFileBuffer — e=/home/andrei/Projects/movavi-new-cart, t=scripts/cart/ava_cart_init.js, i=fcfd4e639dea496359688aaa4ead3bcc4c2d52df
[2019-06-14 06:04:46:416] [17d] GitService.getVersionedFileBuffer — e=/home/andrei/Projects/movavi-new-cart, t=scripts/cart/ava_cart_init.js, i=f00561c2d3d523912edadd315222cae810c41388
[2019-06-14 06:04:46:430] [17e] GitService.getTreeFileForRevision — e=/home/andrei/Projects/movavi-new-cart, t=scripts/cart/ava_cart_init.js, i=fcfd4e639dea496359688aaa4ead3bcc4c2d52df
[2019-06-14 06:04:46:452] [17f] GitService.getTreeFileForRevision — e=/home/andrei/Projects/movavi-new-cart, t=scripts/cart/ava_cart_init.js, i=f00561c2d3d523912edadd315222cae810c41388
[2019-06-14 06:04:46:463] [/home/andrei/Projects/movavi-new-cart] git ls-tree -l fcfd4e639dea496359688aaa4ead3bcc4c2d52df -- scripts/cart/ava_cart_init.js • 32 ms 
[2019-06-14 06:04:46:463] [180] GitTreeParser.parse completed • 0 ms
[2019-06-14 06:04:46:463] [17e] GitService.getTreeFileForRevision completed • 32 ms
[2019-06-14 06:04:46:463] Warning(/usr/bin/git -c core.quotepath=false -c color.ui=false -c log.showSignature=false show f00561c2d3d523912edadd315222cae810c41388:./scripts/cart/ava_cart_init.js --): 
[2019-06-14 06:04:46:463] [/home/andrei/Projects/movavi-new-cart] git show f00561c2d3d523912edadd315222cae810c41388:./scripts/cart/ava_cart_init.js -- • 44 ms 
[2019-06-14 06:04:46:463] [17d] GitService.getVersionedFileBuffer completed • 47 ms
[2019-06-14 06:04:46:463] Warning(/usr/bin/git -c core.quotepath=false -c color.ui=false -c log.showSignature=false show fcfd4e639dea496359688aaa4ead3bcc4c2d52df:./scripts/cart/ava_cart_init.js --): 
[2019-06-14 06:04:46:463] [/home/andrei/Projects/movavi-new-cart] git show fcfd4e639dea496359688aaa4ead3bcc4c2d52df:./scripts/cart/ava_cart_init.js -- • 60 ms 
[2019-06-14 06:04:46:464] [17c] GitService.getVersionedFileBuffer completed • 60 ms
[2019-06-14 06:04:46:464] [/home/andrei/Projects/movavi-new-cart] git ls-tree -l f00561c2d3d523912edadd315222cae810c41388 -- scripts/cart/ava_cart_init.js • 11 ms 
[2019-06-14 06:04:46:464] [181] GitTreeParser.parse completed • 0 ms
[2019-06-14 06:04:46:464] [17f] GitService.getTreeFileForRevision completed • 12 ms
[2019-06-14 06:04:46:637] [182] LineAnnotationController.clear
[2019-06-14 06:04:46:637] [182] LineAnnotationController.clear completed • 0 ms
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.