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

Stuck after merge a branch with a single quote in the name #1354

Closed
dyefim opened this issue Jan 30, 2021 · 2 comments
Closed

Stuck after merge a branch with a single quote in the name #1354

dyefim opened this issue Jan 30, 2021 · 2 comments
Assignees
Labels
bug Something isn't working needs-verification Request for community verification
Milestone

Comments

@dyefim
Copy link

dyefim commented Jan 30, 2021

After the attempt to merge a branch with a single quote in its name GitLens stuck with the next message:
Pulling last-price-in-the-trade-form's-price-field...

  • GitLens Version:

  • Git Version: 2.17.1

  • VSCode Version: 1.52.1
    ea3859d4ba2f3e577a159bc91e3074c5d85c0523
    x64

  • OS Version: Ubuntu 18.04.5 LTS (WSL, Windows 10 )

Steps to Reproduce:

  1. Create a branch with a single quote in its name
  2. Checkout to master
  3. Do right click on branch-with-a-single-qu'ote-in-its-name
  4. Merge Branch into Current Branch...
  5. Stuck

[2021-01-30 18:32:01:916] /home//.vscode-server/extensions/eamodio.gitlens-11.1.3/dist/gitlens.js:2:844163
Error: Command failed: /usr/bin/git -c core.quotepath=false -c color.ui=false merge-base --fork-point branch-with-a-single-qu'ote-in-its-name HEAD

I guess the solution should be:
/usr/bin/git -c core.quotepath=false -c color.ui=false merge-base --fork-point "branch-with-a-single-qu'ote-in-its-name" HEAD

@dyefim dyefim added potential-bug triage Needs to be looked at labels Jan 30, 2021
@eamodio eamodio added bug Something isn't working and removed potential-bug triage Needs to be looked at labels Jan 31, 2021
@eamodio eamodio self-assigned this Jan 31, 2021
@eamodio eamodio modified the milestones: Soonish™, Soon™ Jan 31, 2021
@eamodio eamodio added needs-verification Request for community verification pending-release Resolved but not yet released to the stable edition labels Feb 1, 2021
@eamodio
Copy link
Member

eamodio commented Feb 1, 2021

Can you please verify this fix in the insiders edition?

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

@eamodio eamodio modified the milestones: Soon™, Shipped Feb 3, 2021
@eamodio eamodio removed the pending-release Resolved but not yet released to the stable edition label Feb 9, 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 Mar 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Something isn't working needs-verification Request for community verification
Projects
None yet
Development

No branches or pull requests

2 participants