VS Code incorrectly detects rebase in progress

[schroding3rscat]

Issue Type: Bug

After working with a code and before committing anything to a repo, I stashed all changes and started rebase from SourceTree. VS Code showed me conflicts properly. I did all merge operations in Visual Studio 2017, committed and pushed all changes. There was a bunch of other git operations later. I closed and opened VS Code, restarted PC, did some coding, committed and pushed something. But still, I see a warning that I cannot change commit message in the middle of a rebase:

If I try to commit anything from VS Code, I see error popup:

When I press commit button, I see new lines added to git output in VS Code:

git rebase --continue
No rebase in progress?
git config --get-all user.name
git config --get-all user.email

All other git clients working fine and I can do all git operations. Git syncing and branch switching don't help.
git status output:

λ git status
On branch feature/dev-trials-support
Your branch is up to date with 'origin/feature/dev-trials-support'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   docker-compose.yml

I didn't manage to get rid of this, so I assume there's a bug with the git module.

VS Code version: Code 1.26.1 (493869e, 2018-08-16T18:38:57.434Z)
OS version: Windows_NT x64 10.0.17134

Extensions (18)

Extension	Author (truncated)	Version
RPMSpec	1do	0.1.0
unique-lines	bib	1.0.0
vscode-raml	blz	3.0.1
dart-code	Dar	2.17.1
flutter	Dar	2.17.1
EditorConfig	Edi	0.12.4
LogFileHighlighter	emi	2.4.0
vsc-material-theme	Equ	2.3.0
vscode-guid	hea	1.3.1
rest-client	hum	0.19.1
ecdc	mit	0.12.0
python	ms-	2018.7.1
csharp	ms-	1.15.2
Go	ms-	0.6.88
vscode-yaml	red	0.0.15
vscode-icons	rob	7.25.0
vscode-todo-highlight	way	1.0.4
change-case	wma	1.0.0

(4 theme extensions excluded)

[vscodebot]

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

• Terminal shows previous commands behind git interactive rebase (#47028)

[joaomoreno]

I did all merge operations in Visual Studio 2017, committed and pushed all changes.

How did you commit. If you are in a middle of a rebase, you should've used git rebase --continue: https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/

Anyway, is there a .git/REBASE_HEAD file in your git repo? If so, just delete it.

[schroding3rscat]

How did you commit. If you are in a middle of a rebase, you should've used git rebase --continue

I did all the work in SourceTree as usual. SourceTree, Visual Studio 2017 and git status don't show any rebase process now. Why does VS Code do?
I do have .git/REBASE_HEAD. But before deleting it I want to know why VS Code behaves like this.

[joaomoreno]

VS Code checks whether that file exists to determined if there's a rebase in flow. Apparently that check is insufficient and we should also check for other signs of rebase.

[schroding3rscat]

Great! Do you need any additional info from me?

[joaomoreno]

Can you show me the full output of git status?

[joaomoreno]

Here's some reference for fixing this: https://stackoverflow.com/questions/3921409/how-to-know-if-there-is-a-git-rebase-in-progress

[schroding3rscat]

Can you show me the full output of git status?

I'm afraid I can't. I checked the git section in vscode and it seems that problem disappeared now. Today I did a rebase in SourceTree again and switched branches. I think this helped and REBASE_HEAD was removed.
But I added git status output to the bug description when I created it yesterday. I run this command when I had a problem.

[jeanbenitez]

Hi! I had the same issue, I solved removing .git/REBASE_HEAD:
rm -rf .git/REBASE_HEAD

[dklotz]

I ran into the same issue after doing an interactive rebase in another external tool, Fork in my case. I could also solve it by removing the REBASE_HEAD file. The output of git status (before I removed that file) is simply:

On branch foo-bar-feature
nothing to commit, working tree clean

[joaomoreno]

Fixed by #57651