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

Don't attempt to update remote head if pull fails

Browse source
This commit is contained in:
Markus Olsson 2024-04-29 14:11:51 +02:00
parent 8461f421dc
commit 7a743489a1
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4653,21 +4653,18 @@ export class AppStore extends TypedBaseStore<IAppState> {
}
await gitStore.performFailableOperation(
() =>
pullRepo(repository, account, remote, progress => {
async () => {
await pullRepo(repository, account, remote, progress => {
this.updatePushPullFetchProgress(repository, {
...progress,
value: progress.value * pullWeight,
})
}),
{
gitContext,
retryAction,
}
})
await updateRemoteHEAD(repository, account, remote)
},
{ gitContext, retryAction }
)
await updateRemoteHEAD(repository, account, remote)
const refreshStartProgress = pullWeight + fetchWeight
const refreshTitle = __DARWIN__
? 'Refreshing Repository'

7
app/src/lib/stores/git-store.ts
View file

@ -1060,11 +1060,12 @@ export class GitStore extends BaseStore {
repository: this.repository,
}
await this.performFailableOperation(
() => fetchRepo(this.repository, account, remote, progressCallback),
async () => {
await fetchRepo(this.repository, account, remote, progressCallback)
await updateRemoteHEAD(this.repository, account, remote)
},
{ backgroundTask, retryAction }
)
await updateRemoteHEAD(this.repository, account, remote)
}
/**