Polish and fix git rebase --continue experience

[alexisfrjp]

• VSCode Version: 1.52.1
• OS Version: Windows 10 home 20H2 19042.746

I have the same issue as #104502

It happens when I rebase a branch onto another one with conflicts. In VSCode, I resolve the conflicts, stage all the files and click on the tick box to commit. It runs forever like in the screen recording of the #104502's author.

While looping forever, I run git rebase --continue manually in the terminal and it tells me the file .COMMIT_EDITMSG already exits.

[vscodebot]

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

• Git: Can't rebase continue or commit without modified files (#60149)
• Git "rebase onto selected" support (#108725)
• "Git: Stage Changes" command doesn't work during rebase conflict (#113302)
• Rebase current branch onto another branch (#108913)

[PyroSA]

Damn - didn't grab my screen. Ended up manually doing a git rebase continue.

In process explorer, there was (something like)

git rebase --continue
  git commit
    sh vi
      sh vi

And it hangs indefinitely.
If you kill the vi process, it gives an error and gets you back to the pre-continue state.

I'm assuming the vi process is actually waiting for input that the git extension never supplies or exposes to the user.

Possibly related - I have git pre-commit and pre-commit-msg hooks

[mattpepin]

I have the same issue, here's the process explorer output with the culprit:

git rebase --continue
-- /usr/lib/git-core/git commit -n --no-gpg-sign -F .git/rebase-merge/message -e --allow-empty
---- /usr/bin/vim /home/matt/project/.git/COMMIT_EDITMSG

I'm working in a Remote SSH environement, with EDITOR=vim

If I use EDITOR="code -w", it works, but I can't change the commit message, since code is evoked remotely and just exits.

[felix-ht]

I have the same issue on m1 mac, rebase from within vscode is broken because it either hangs or causes a "Terminal is dumb, but EDITOR unset error."

code --version
> 1.56.2
> 054a9295330880ed74ceaedda236253b4f39a335
> arm64

Logs for the hanging case. I rebased a branch on master, and resolved a conflict request from within code. If i press ✓ or do command enter the git part of code gets stuck. I can manually finish the rebase with rebase --continue. However i have been doing my rebases fully from within code for years and would like to keep doing that.

Looking for git in: /usr/bin/git
Using git 2.30.1 (Apple Git-130) from /usr/bin/git
> git rev-parse --git-dir
Open repository: /redacted
> git fetch
> git status -z -u
> git symbolic-ref --short HEAD
> git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/modules refs/remotes/modules
> git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
> git remote --verbose
> git config --get commit.template
> git show --textconv :lib/data/models/serializers.g.dart
> git ls-files --stage -- /redacted/lib/data/models/serializers.g.dart
> git cat-file -s b0db1e32d236826b5acf110ef4890d33cbd0fbf9
> git check-ignore -v -z --stdin
> git ls-files --stage -- /redacted/lib/data/models/serializers.g.dart
> git cat-file -s b0db1e32d236826b5acf110ef4890d33cbd0fbf9
> git show --textconv :lib/data/models/serializers.g.dart
> git status -z -u
> git symbolic-ref --short HEAD
> git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/modules refs/remotes/modules
> git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
> git remote --verbose
> git config --get commit.template
> git ls-files --stage -- /redacted/lib/data/models/serializers.g.dart
> git cat-file -s b0db1e32d236826b5acf110ef4890d33cbd0fbf9
> git show --textconv :lib/data/models/serializers.g.dart
> git status -z -u
> git symbolic-ref --short HEAD
> git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/modules refs/remotes/modules
> git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
> git remote --verbose
> git config --get commit.template
> git ls-files --stage -- /redacted/lib/data/models/serializers.g.dart
> git cat-file -s 8ef27c8907e2b3e346bc45b59d47b631b0aff9da
> git show --textconv :lib/data/models/serializers.g.dart
> git status -z -u
> git symbolic-ref --short HEAD
fatal: ref HEAD is not a symbolic ref
> git rev-parse HEAD
> git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
> git remote --verbose
> git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z ea357397bf4c9780e0dfe199a5fa76f7a3abb43b
> git check-ignore -v -z --stdin
> git status -z -u
> git symbolic-ref --short HEAD
fatal: ref HEAD is not a symbolic ref
> git rev-parse HEAD
> git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
> git remote --verbose
> git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z ea357397bf4c9780e0dfe199a5fa76f7a3abb43b
git.stage 1
git.stage.scmResources 1
> git add -A -- /redacted/lib/data/models/serializers.g.dart
> git status -z -u
> git symbolic-ref --short HEAD
fatal: ref HEAD is not a symbolic ref
> git rev-parse HEAD
> git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
> git remote --verbose
> git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z ea357397bf4c9780e0dfe199a5fa76f7a3abb43b
> git ls-files --stage -- /redacted/lib/data/models/serializers.g.dart
> git cat-file -s 51886970e48181eb6ccc517c06a84844cd7b104d
> git show --textconv :lib/data/models/serializers.g.dart
> git status -z -u
> git symbolic-ref --short HEAD
fatal: ref HEAD is not a symbolic ref
> git rev-parse HEAD
> git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
> git remote --verbose
> git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z ea357397bf4c9780e0dfe199a5fa76f7a3abb43b
> git rebase --continue
> git ls-files --stage -- /redacted/lib/data/models/serializers.g.dart
> git cat-file -s 51886970e48181eb6ccc517c06a84844cd7b104d
> git show --textconv :lib/data/models/serializers.g.dart
> git ls-files --stage -- /redacted/lib/data/models/serializers.g.dart
> git cat-file -s 51886970e48181eb6ccc517c06a84844cd7b104d
> git show --textconv :lib/data/models/serializers.g.dart

[wzh-mei]

Version: 1.59.0
Still got this error

[Spongman]

I'm seeing the same thing. 1.60.2. commit in vscode after rebase conflict, htop shows that vscode has run git rebase --continue and that that has spawn vi in the background.

[avinersan]

Facing same issue.
Changing the git global core editor from vim to code worked.

[huwjeffries]

Same issue in VS Code version 1.6.1.2.
From the source control tab in VSCode :
... -> Branch -> Rebase branch -> Master
Resolved conflicts in the files.
Staged resolved files.
Click the tick to commit.
Commit in progress blue bar keeps going forever. Trying to commit at the Terminal gives the error:

E325: ATTENTION
Found a swap file by the name "C:/git3/sam-role-based-access-control/.git/.COMMIT_EDITMSG.swp"
          owned by: huw.jeffries   dated: Wed Nov 03 08:50:07 2021
         file name: /c/git3/sam-role-based-access-control/.git/COMMIT_EDITMSG
          modified: no
         user name: huw.jeffries   host name: MACHINE_NAME
        process ID: 1831 (STILL RUNNING)
While opening file "C:/git3/sam-role-based-access-control/.git/COMMIT_EDITMSG"
             dated: Wed Nov 03 09:01:51 2021
      NEWER than swap file!

[LisaRebecca]

Same error, for me it was fixed with git rebase --abort and quitting vscode in task manager. After the restart I was able to perform the rebase without it getting stuck.

[pri-kise]

Having the same issue on several different window 10 computers.

[MohamedAlwash]

• VSCode Version: 1.52.1
• OS Version: Windows 10 home 20H2 19042.746

I have the same issue as #104502

It happens when I rebase a branch onto another one with conflicts. In VSCode, I resolve the conflicts, stage all the files and click on the tick box to commit. It runs forever like in the screen recording of the #104502's author.

While looping forever, I run git rebase --continue manually in the terminal and it tells me the file .COMMIT_EDITMSG already exits.

I have the same problem, is there any solution?

[PyroSA]

Changing the git global core editor from vim to code worked.

git config --global core.editor code --wait

This did work in my latest rebase. Opens the commit file in code, but it's plenty easy to close that.

[felix-ht]

works for me as well - would be nice tho if it's not even shown

[rustyx]

The VSCode Git extension should set core.editor to code --wait automatically before invoking git.
Please fix this!
For now the workaround is git config --global core.editor "code --wait". Obvious downside is that VSCode is being started even when rebasing from command line.

[DonnieFy]

Changing the git global core editor from vim to code worked.

git config --global core.editor code --wait

This did work in my latest rebase. Opens the commit file in code, but it's plenty easy to close that.

this did work for me ,thanks

[lszomoru]

This issue has been fixed with f19251a. Today's Insiders release (2022-07-21) contains the fix.
Please give it a try and let me know if you are still able to reproduce the issue. Thank you very much!

[alexr00]

@lszomoru is the fix just that the commit message editor doesn't show and that the commit input box is pre-populated with a commit message? If so, I have verified this.