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

interactive rebase broken & cannot disable #1395

Closed
BlackthornYugen opened this issue Feb 23, 2021 · 7 comments
Closed

interactive rebase broken & cannot disable #1395

BlackthornYugen opened this issue Feb 23, 2021 · 7 comments

Comments

@BlackthornYugen
Copy link

  • GitLens Version: v11.2.1
  • Git Version: Run git version 2.17.1
  • VSCode Version: Run 1.53.2 622cb03f7e070a9670c94bae1a45d78d7181fbd4 x64
  • OS Version:
Remote WSL: Ubuntu-18.04
OS Linux x64 5.4.72-microsoft-standard-WSL2

Steps to Reproduce:

  1. export EDITOR='code --wait'
  2. git rebase -i origin/master

image

These steps seem to initiate a "gitlense interactive rebase" but I just want my normal interactive rebase... It seems to do this because gitlense is the default editor for files called "git-rebase-todo"

image

Nothing logs to the GitLense output even with "gitlens.outputLevel": "debug". I just want to stop gitlense from automatically opening the git-rebase-todo if possible.

@BlackthornYugen BlackthornYugen added potential-bug triage Needs to be looked at labels Feb 23, 2021
@BlackthornYugen
Copy link
Author

The "Switch to text" and "disable rebase editor" buttons both don't actually do anything nor do they produce anything in the gitlense output.

@eamodio
Copy link
Member

eamodio commented Mar 1, 2021

Duplicate of #1172 which should be fixed in the latest VS Code insiders: #1172 (comment)

@eamodio eamodio closed this as completed Mar 1, 2021
@eamodio eamodio added duplicate and removed potential-bug triage Needs to be looked at labels Mar 1, 2021
@BlackthornYugen
Copy link
Author

Had a look at #1172 and I can verify that installing gitlense locally seems to be an interim solution.

@eamodio
Copy link
Member

eamodio commented Mar 1, 2021

Hopefully 1.54 (shipping later this week) will fix it for good.

@BlackthornYugen
Copy link
Author

Hope so. VSCode started disabling my local GitLense, and won't seem to let me disable the remote one. I disable it, then it says it will take effect after a reload but it re-enables it on me after restarting.

image

@BlackthornYugen
Copy link
Author

For the day that it worked for me, I actually liked the GitLense rebase interface. It had nice shortcut keys and had a nice clear way of presenting all the info without changing to far from the text way of doing it. It also lets you switch to the text form if you want too.

Looking forward to 1.54 :)

@github-actions
Copy link

github-actions bot commented Apr 2, 2021

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 Apr 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants