Skip to content

Commit e96806a

Browse files
committed
Always show the "Stash changes" option in the LocalChangesOverwritten dialog
Now that we support multiple stashes, stashing is always an option.
1 parent 3a21f77 commit e96806a

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

app/src/ui/app.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,14 +2078,8 @@ export class App extends React.Component<IAppProps, IAppState> {
20782078
)
20792079
}
20802080
case PopupType.LocalChangesOverwritten:
2081-
const selectedState = this.state.selectedState
2082-
2083-
const existingStash =
2084-
selectedState !== null &&
2085-
selectedState.type === SelectionType.Repository
2086-
? selectedState.state.changesState.stashEntries.length > 0
2087-
: false
2088-
2081+
// Now that we support multiple stashes, lie to the dialog so that it always shows the "stash changes" option.
2082+
const existingStash = false
20892083
return (
20902084
<LocalChangesOverwrittenDialog
20912085
repository={popup.repository}

0 commit comments

Comments
 (0)