Interactive rebase intermittently fails to open properly

[eamodio]

Originally posted by @daulis in #4078

@eamodio Thank you! This already seems much better, and I can't reproduce the specific issue anymore (it was easily reproducible before for me). I tested with version = 2025.3.1305. This solved the main issue of the lockup, which could previously only be corrected by a Reload Window

I still see one odd case related to this workflow, but the symptoms are slightly different:

• git rebase -i origin/main
• GitLens commit view shows: "Pending rebase of MY_BRANCH onto main" (as expected)
• Commandline shows: "hint: Waiting for your editor to close the file..." (as expected)
• .git/rebase-merge/git-rebase-todo is opened in the GUI
  • Sometimes this opens the "GitLens Interactive Rebase" GUI, with the commit list (as expected)
  • But sometimes no file contents are displayed at all - The contents of the file tab are blank, and the "GitLens Interactive Rebase" part of the tab never displays. It just sits there waiting. (not expected)
  • When this occurs, the actual file contents of .git/rebase-merge/git-rebase-todo are correct. But, nothing will display in the GUI.

The only way to recover is:

• Close the git-rebase-todo editor window
• git rebase --abort
• Try to rebase again: git rebase -i origin/main

[eamodio]

@daulis I haven't seen anything like that. Can you provide more details on your OS/Git/VS Code version and provide logs when you experience this issue.

Also if when this happens, check if you see both .git/rebase-merge/ and .git/rebase-apply.

[daulis]

Versions:

• OS: I see this when running inside a devcontainer under WSL, with the following OS-related pieces:
  • WSL version: 2.5.1.0
  • WSL Distribution: Ubuntu 20.04.6 LTS
  • devcontainer distribution: Ubuntu 22.04.5 LTS
• Git: 2.48.1
• vscode: 1.98.2
  • Dev Containers extension version: 0.401.0
  • WSL extension version: 0.88.5
• GitLens version: 2025.3.1305
  • I'm using the latest prerelease version that fixes the issue from https://github.com/gitkraken/vscode-gitlens/issues/4078, but I don't think the fix for 4078 caused this issue. I've seen this issue in the past

Files:

• .git/rebase-merge - Present and contains these files: git-rebase-todo git-rebase-todo.backup head-name interactive no-reschedule-failed-exec onto orig-head
• .git/rebase-apply - Does not exist

Some extra notes:

• This issue does not happen everytime. But, it happens enough that it's repeatable. It normally takes be between 1-3 tries to trigger it
• I have not seen this when using GitLens directly in WSL

(It will probably take me a little bit to get logs, and make sure there's no sensitive data in there)