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 breaks with same named files in different folders #993

Closed
mjmatthiesen opened this issue Apr 3, 2020 · 6 comments
Closed
Labels
bug Something isn't working needs-more-info Needs further information, steps, details, etc.

Comments

@mjmatthiesen
Copy link

Issue Type: Bug

Steps to Reproduce:

  1. Create a named file with similar contents over several folders.
  2. Commit to each file a few times. Delete some, whatever.
  3. Open GitLens and the File History.
  4. See file history that doesn't match the current file.

Here is an example history:
image
Click on the first one and end up in a different folder, different file:
image

Now this may be entirely a git issue and not gitlens related.

Extension version: 10.2.1
VS Code version: Code 1.43.2 (0ba0ca52957102ca3527cf479571617f0de6ed50, 2020-03-24T07:38:38.248Z)
OS version: Windows_NT x64 10.0.17134

System Info
Item Value
CPUs Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz (4 x 2592)
GPU Status 2d_canvas: enabled
flash_3d: enabled
flash_stage3d: enabled
flash_stage3d_baseline: enabled
gpu_compositing: enabled
multiple_raster_threads: enabled_on
oop_rasterization: disabled_off
protected_video_decode: unavailable_off
rasterization: enabled
skia_renderer: disabled_off_ok
video_decode: enabled
viz_display_compositor: enabled_on
viz_hit_test_surface_layer: disabled_off_ok
webgl: enabled
webgl2: enabled
Load (avg) undefined
Memory (System) 7.91GB (2.12GB free)
Process Argv
Screen Reader no
VM 0%
@eamodio
Copy link
Member

eamodio commented Apr 15, 2020

@mjmatthiesen Could you possibly setup an example repo to show this behavior?

@eamodio eamodio added needs-more-info Needs further information, steps, details, etc. type: potential bug labels Apr 15, 2020
@mjmatthiesen
Copy link
Author

https://github.com/mjmatthiesen/vscode-gitlens-history-bug

Here, this one will do. Open acclaim/index.html or likely many of the other files.

View the file history:
image

Meanwhile the changes on github:
image

And using gitk:
image

Or git log on the file:
image

@mjmatthiesen
Copy link
Author

?

@mjmatthiesen
Copy link
Author

Hi,

Any movement on this? It's a pretty easily reproducible issue.

@mjmatthiesen
Copy link
Author

This appears to be resolved with the newest version

@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 Dec 18, 2020
@eamodio eamodio added bug Something isn't working and removed potential-bug labels Apr 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working needs-more-info Needs further information, steps, details, etc.
Projects
None yet
Development

No branches or pull requests

2 participants