development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-31 11:07:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't do anything in processMultiCommitOperationRebaseResult for RebaseResult.AlreadyUpToDate

Browse source
This commit is contained in:
Sergio Padrino 2023-09-06 18:59:35 +02:00
parent 8c09c2523a
commit 30a180acfa
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/ui/dispatcher/dispatcher.ts
View file

@ -123,6 +123,7 @@ import { getMultiCommitOperationChooseBranchStep } from '../../lib/multi-commit-
import { ICombinedRefCheck, IRefCheck } from '../../lib/ci-checks/ci-checks'
import { ValidNotificationPullRequestReviewState } from '../../lib/valid-notification-pull-request-review'
import { UnreachableCommitsTab } from '../history/unreachable-commits-dialog'
import { sendNonFatalException } from '../../lib/helpers/non-fatal-exception'
/**
* An error handler function.
@ -3657,7 +3658,15 @@ export class Dispatcher {
// conflict flow if squash results in conflict.
const status = await this.appStore._loadStatus(repository)
switch (result) {
case (RebaseResult.CompletedWithoutError, RebaseResult.AlreadyUpToDate):
case RebaseResult.AlreadyUpToDate:
sendNonFatalException(
'rebaseConflictsWithBranchAlreadyUpToDate',
new Error(
`processMultiCommitOperationRebaseResult was invoked (which means Desktop went into a conflicts-found state) but the branch was already up-to-date, so there couldn't be any conflicts at all`
)
)
break
case RebaseResult.CompletedWithoutError:
if (status !== null && status.currentTip !== undefined) {
// This sets the history to the current tip
// TODO: Look at history back to last retained commit and search for
@ -3672,7 +3681,7 @@ export class Dispatcher {
await this.completeMultiCommitOperation(
repository,
result === RebaseResult.AlreadyUpToDate ? 0 : totalNumberOfCommits
totalNumberOfCommits
)
break
case RebaseResult.ConflictsEncountered: