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

GitLens's rebase UI randomly fails loading interactive rebase when performed outside of VSC #2141

Closed
Mumeii opened this issue Aug 9, 2022 · 2 comments
Assignees
Labels
bug Something isn't working needs-verification Request for verification
Milestone

Comments

@Mumeii
Copy link

Mumeii commented Aug 9, 2022

GitLens Version

v12.1.2

VS Code Version

Version : 1.70.0
Validation : da76f93349a72022ca4670c1b84860304616aaa2
Date : 2022-08-04T04:39:20.716Z (il y a 5 jours)
Electron : 18.3.5
Chromium: 100.0.4896.160
Node.js : 16.13.2
V8 : 10.0.139.17-electron.0
Système d’exploitation : Darwin arm64 21.5.0

Git Version

git version 2.37.0 (mac os)

Description

Hi

Right now in my ~/.gitconfig file, I have the following entries :

[color]
        ui = auto
[core]
        autocrlf = input
        editor = code --wait
[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE
[rebase]
        autoSquash = true
[pull]
        rebase = false

As you can see, I'm relying on VSC to edit my rebases, especially when performing them in a shell outside of VSC.

Also notice that I'm using much the git --fixup option upon comits, and that's why I've added the

[rebase]
        autoSquash = true

It seems that the trouble I'm encountering appeared since GitLens UI became the default one to display git rebase "scripts".

Bug Description :

Now, half of the time, when I start an interactive rebase from outside of VSC, the GitLens UI is displaying empty list of modifications whereas they are some :

182185468-d7854ea7-aed6-4132-9195-778b070fbab9

Can't tell much more about it, as I don't really understand what is triggering this trouble.

Previous to GitLens UI been the default rebase one, everything was working fine.

Nevertheless, notice that I can't tell if it's due to GitLens, or something else that would have been delivered at the same time or close to it, in a former version of VSC

And, last but not least :
Fortunately, as most of the time I have nothing to change due to the use of autoSquash = true option, closing the empty rebase tab is enough to still have the rebase processed the right way from the external git command.

The only drawback in that specific case that a popup window is warning me that modifications are left pending and is asking me, amongst other things, if I want to skip recording them :

182185858-8c370521-40a6-4914-859c-de2544decf26

This is this option I choose and is working for my use case.

Logs, Screenshots, Screen Captures, etc

see above the attached screenshots.

@Mumeii Mumeii added potential-bug triage Needs to be looked at labels Aug 9, 2022
@eamodio eamodio self-assigned this Nov 6, 2022
@eamodio eamodio added bug Something isn't working and removed potential-bug triage Needs to be looked at labels Nov 6, 2022
@eamodio eamodio added this to the 13.1 milestone Nov 6, 2022
@eamodio eamodio closed this as completed in 528e1e3 Nov 6, 2022
@eamodio eamodio added pending-release Resolved but not yet released to the stable edition needs-verification Request for verification labels Nov 6, 2022
@eamodio
Copy link
Member

eamodio commented Nov 6, 2022

Can you please verify this fix in tomorrow's pre-release edition of GitLens?

You can switch to the pre-release edition of GitLens, by clicking on the "Switch to Pre-Release version of this extension" from the Extensions view.

image

@d13 d13 removed the pending-release Resolved but not yet released to the stable edition label Nov 22, 2022
@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 23, 2022
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 verification
Projects
None yet
Development

No branches or pull requests

3 participants