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

Branches in Repositories view shows some commit comment texts as branches #625

Closed
haojun99 opened this issue Jan 13, 2019 · 4 comments

Comments

Projects
None yet
3 participants
@haojun99
Copy link

commented Jan 13, 2019

  • GitLens Version: 9.4.1
  • VSCode Version: 1.30.0
  • OS Version: Windows 10

Steps to Reproduce:

  1. Just open Branches in Repositories view. Some commit comment texts are shown as branches. When it gets worse, Branches won't show anything due to conflicting IDs (two commit comments with same texts).

I ran "git branch -vv --abbrev=40 -a". One suspicious thing I saw is the ^M character in some commit comment, e.g.
remotes/origin/branchABC 7a841f39c052765c5fd04fa5253116d076dd9f3e Merge branch 'abc' into 'master'^M ^M Integrate Jobs UI^M ^M See merge request !9132

Is the text after ^M considered as a new line and thus a branch name?

@haojun99

This comment has been minimized.

Copy link
Author

commented Jan 13, 2019

Here is a screenshot. With the same Repository, I don't see the same issue on Linux.
untitled

@halicki

This comment has been minimized.

Copy link

commented Mar 15, 2019

I can confirm the same issue on:

  • gitlens: 9.5.1
  • vscode: 1.32.3
  • ubuntu 18.04 LTS

And also in the repo on which the problem occurs has multiple commits with ^M character in their message.

@eamodio

This comment has been minimized.

Copy link
Owner

commented Apr 17, 2019

@haojun99 @halicki Do either of you have a repo I can clone that has this issue?

@eamodio eamodio self-assigned this Apr 27, 2019

@eamodio eamodio added this to the Soon™ milestone Apr 27, 2019

@eamodio

This comment has been minimized.

Copy link
Owner

commented May 10, 2019

Fixed in 9.7

@eamodio eamodio closed this May 10, 2019

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.