Git - Fix Commit action button enablement regression (#163159)

Fix Commit action button enablement regression
This commit is contained in:
Ladislau Szomoru 2022-10-10 14:06:20 +02:00 committed by GitHub
parent 8e1235ee25
commit d53074babf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -203,7 +203,7 @@ export class ActionButtonCommand {
this.state = {
...this.state,
HEAD: this.repository.HEAD,
isMergeInProgress: this.repository.mergeInProgress,
isMergeInProgress: this.repository.mergeGroup.resourceStates.length !== 0,
isRebaseInProgress: !!this.repository.rebaseCommit,
repositoryHasChangesToCommit: this.repositoryHasChangesToCommit()
};