development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-18 07:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11243 from desktop/something-about-einstein-and-doing-the-same-thing-over-and-over-again

Browse source 
Don't attempt to check out the currently checked out branch
This commit is contained in:
Markus Olsson 2020-12-18 11:25:15 +01:00 committed by GitHub
parent 367048f54c ff5c633cf8
commit 2f6de415d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/lib/stores/app-store.ts
View file

@ -3060,6 +3060,11 @@ export class AppStore extends TypedBaseStore<IAppState> {
const { tip } = branchesState
const hasChanges = changesState.workingDirectory.files.length > 0
// No point in checking out the currently checked out branch.
if (tip.kind === TipState.Valid && tip.branch.name === branch.name) {
return repository
}
let strategy = explicitStrategy ?? this.uncommittedChangesStrategy
// The user hasn't been presented with an explicit choice