Interactive rebase editor not opening git-rebase-todo properly

[raphinesse]

Issue Type: Bug

About every other time I start an interactive rebase (from a terminal) the editor comes up empty (No commits to rebase). However, the editor tab has an unsaved-indicator and if I inspect the contents of .git/rebase-merge/git-rebase-todo by other means, the file looks OK.

When aborting the rebase from the editor, the editor closes but I get an error notification stating

Failed to save 'git-rebase-todo': The content of the file is newer. Please compare your version with the file contents or overwrite the content of the file with your changes.

which I dismiss by choosing Overwrite. This finally aborts the rebase with the usual terminal message "error: nothing to do".

The GitLens log only outputs a line at the very end of this process:

[~/example/.git/rebase-merge] Git Command failed: /usr/bin/git -c core.quotepath=false -c color.ui=false rev-parse --show-toplevel • this operation must be run in a work tree • 16 ms 

To me, this seems like a race condition. Like GitLens is reading the contents of the file before git finished writing or something like that. I could not reproduce this problem when using the plain text editor.

Extension version: 11.2.1
VS Code version: Code 1.53.2 (622cb03f7e070a9670c94bae1a45d78d7181fbd4, 2021-02-11T11:48:44.518Z)
OS version: Linux x64 5.4.0-65-generic snap

System Info

Item	Value
CPUs	AMD Athlon(tm) II X4 635 Processor (4 x 800)
GPU Status	2d_canvas: enabled gpu_compositing: enabled multiple_raster_threads: enabled_on oop_rasterization: disabled_off opengl: enabled_on protected_video_decode: unavailable_off rasterization: disabled_software skia_renderer: enabled_on video_decode: disabled_software vulkan: disabled_off webgl: enabled webgl2: enabled
Load (avg)	1, 1, 1
Memory (System)	11.70GB (0.29GB free)
Process Argv	. --no-sandbox --crash-reporter-id d34e3cdb-1dc7-4dd6-8553-78926379d0e2
Screen Reader	no
VM	0%
DESKTOP_SESSION	ubuntu
XDG_CURRENT_DESKTOP	Unity
XDG_SESSION_DESKTOP	ubuntu
XDG_SESSION_TYPE	x11

[eamodio]

@raphinesse Are you still seeing this? Does it happen every time? Are you using Linux directly or via remote?

[raphinesse]

Yes, I'm still seeing this. I work on a local Linux host.

Regarding the frequency: the behavior above occurs almost every time I start a given interactive rebase for the first time. If I try it a second time right after that it always works.

[DerRM]

I also see this issue when I type:

git rebase -i <commit-id>

But when I use the UI and choose a Commit in "Commits" and the option "Rebase Current Branch onto Commit..." and I select "Interactive Rebase" it works as expected. But the command issued is this:

git -c sequence.editor="code --wait --reuse-window" rebase --interactive <commit-id>

If I issue the same command manually it also works

[github-actions]

This issue needs more information and has not had recent activity. Please provide the missing information or it will be closed in 7 days. Thanks!

[raphinesse]

I think the requested information has been provided. This is still very much an issue for me.

Is there anything I can do to move this forward?

[github-actions]

This issue needs more information and has not had recent activity. Please provide the missing information or it will be closed in 7 days. Thanks!

[mnoorenberghe]

This seems to be related to my issue on macOS with missing "unsaved" tabs after a duplicate git-rebase-todo tab: microsoft/vscode#118556

[raphinesse]

Another symptom of this problem (only happens in projects where I use the interactive rebase editor):

When I want to start an interactive rebase, I sporadically get this error:

fatal: It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
    git rebase (--continue | --abort | --skip)
If that is not the case, please
    rm -fr ".git/rebase-merge"
and run me again.  I am stopping in case you still have something
valuable there.

Where the only solution is rm -fr ".git/rebase-merge" since git rebase --abort will abort with the error

warning: could not read '.git/rebase-merge/head-name': No such file or directory