Skip to content

VS Code incorrectly detects rebase in progress #57299

@schroding3rscat

Description

@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:
screenshot_4

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

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)

Metadata

Metadata

Assignees

Labels

bugIssue identified by VS Code Team member as probable buggitGIT issuesverifiedVerification succeeded

Type

No type

Projects

No projects

Relationships

None yet

Development

No branches or pull requests

Issue actions