Interference with interactive rebase

[jrray]

Type: Bug

This started happing to me in the last week or so. I'm using a WSL2 container with ubuntu 20.04.

1. Begin an interactive rebase in the terminal with git rebase -i main
2. Change one of the steps of the rebase to edit
3. Save and quit so the selected commit is checked out

After a few seconds, the main branch is checked out.

# expected sha1 of commit being edited
jrray@STRANDED:~/git/project$ git rev-parse HEAD
16f1d4a196fb2f91f8ee9b7a24fcec6607cdb8b1

# sha1 of "main" branch
jrray@STRANDED:~/git/project$ git rev-parse HEAD
fe4dbf24ca0059e788255edbab31500e93d1e2e7

git status shows rebase still in progress (but we're sitting on the wrong commit):

jrray@STRANDED:~/git/project$ git status
On branch main
Your branch is up to date with 'origin/main'.

Last command done (1 command done):
   edit 16f1d4a1 Commit message
Next commands to do (13 remaining commands):
   pick c0841252 Commit message
   pick 7f774d56 Commit message
  (use "git rebase --edit-todo" to view and edit)
You are currently editing a commit while rebasing branch 'jrray/issue742' on 'fe4dbf24'.
  (use "git commit --amend" to amend the current commit)
  (use "git rebase --continue" once you are satisfied with your changes)

The only workaround is to manually git checkout 16f1d4a1 to get back on the expected commit again, and then git rebase --continue works normally.

This stopped happening when I disabled the extension.

Extension version: 0.66.0
VS Code version: Code 1.79.0 (b380da4ef1ee00e224a15c1d4d9793e27c2b6302, 2023-06-07T14:26:35.552Z)
OS version: Windows_NT x64 10.0.22000
Modes:
Remote OS version: Linux x64 5.15.90.1-microsoft-standard-WSL2

System Info

Item	Value
CPUs	Intel(R) Core(TM) i9-10900X CPU @ 3.70GHz (20 x 3696)
GPU Status	2d_canvas: enabled canvas_oop_rasterization: disabled_off direct_rendering_display_compositor: disabled_off_ok gpu_compositing: enabled multiple_raster_threads: enabled_on opengl: enabled_on rasterization: enabled raw_draw: disabled_off_ok video_decode: enabled video_encode: enabled vulkan: disabled_off webgl: enabled webgl2: enabled webgpu: enabled
Load (avg)	undefined
Memory (System)	63.68GB (16.71GB free)
Process Argv	--crash-reporter-id 75c29f79-8718-415f-b773-3e4a5f372698
Screen Reader	no
VM	0%

Item	Value
Remote	WSL: Ubuntu-20.04
OS	Linux x64 5.15.90.1-microsoft-standard-WSL2
CPUs	Intel(R) Core(TM) i9-10900X CPU @ 3.70GHz (20 x 3695)
Memory (System)	31.19GB (27.23GB free)
VM	0%

A/B Experiments

vsliv368cf:30146710
vsreu685:30147344
python383cf:30185419
vspor879:30202332
vspor708:30202333
vspor363:30204092
vswsl492cf:30256860
vslsvsres303:30308271
vserr242cf:30382550
pythontb:30283811
vsjup518:30340749
pythonptprofiler:30281270
vshan820:30294714
vstes263:30335439
vscod805:30301674
binariesv615:30325510
bridge0708:30335490
bridge0723:30353136
cmake_vspar411:30581797
vsaa593:30376534
pythonvs932:30410667
cppdebug:30492333
vsclangdf:30486550
c4g48928:30535728
dsvsc012cf:30540253
pynewext54:30695312
azure-dev_surveyone:30548225
vscccc:30610679
282f8724:30602487
pyind779:30671433
f6dab269:30613381
pythonsymbol12:30671437
showlangstatbar:30737416
vsctsb:30748421
pythonms35:30701012
03d35959:30757346
pythonfmttext:30731395
pythoncmvfstrcf:30756944
fixshowwlkth:30730052
hidesbindicator:30760978
pythongtdpath:30739704
dh2dc718:30763024

[alexr00]

I'm not able to reproduce this. Can you share the output from GitHub Pull Request next time you see this?

[Catalin-Andronie]

@alexr00 this issue occurs only when you're working on an issue in VS Code.

Steps to Reproduce:

1. Open VS Code and keep it running.
2. Ensure the GitHub Pull Requests extension is installed.
3. In the extension’s Issues tab, select an issue and click “Start working on issue and Checkout topic branch.” A new branch is created and checked out (indicated by a check icon on the issue).
4. On this branch, make a file change and commit it. Then push to remote.
5. In any terminal (internal or external), run: git rebase main -i
6. In the interactive rebase file, mark the commit as edit.

---

Expected:
git status should show you're on the commit marked for editing.

Actual:
You're unexpectedly on the main branch.

---

Conclusion:
This behavior only occurs when VS Code is open and the GitHub Pull Requests extension is enabled. If VS Code is closed or the extension is disabled, git rebase works as expected. This suggests the extension is automatically checking out main during the rebase, similar to manually clicking "Stop working on Issue."