Skip to content

Commit 6970977

Browse files
committed
Improve error display when using the "Pull all" button with unpubished branches
1 parent b49bd37 commit 6970977

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

app/src/lib/stores/app-store.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5338,6 +5338,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
53385338
theirBranch: tip.branch.upstream,
53395339
currentBranch: tip.branch.name,
53405340
}
5341+
} else {
5342+
throw new Error(
5343+
`This branch (${tip.branch.name}) has not been published yet.`
5344+
)
53415345
}
53425346

53435347
const title = `Pulling ${remote.name}`

app/src/ui/repositories-list/repositories-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ export class RepositoriesList extends React.Component<
506506
.filter(r => r instanceof Repository)
507507
.map(r =>
508508
this.props.dispatcher.pull(r).catch(e => {
509-
throw Error(`Error pulling repository ${r.name}:\n${e}`, e)
509+
throw Error(`Error pulling '${r.name}' (${r.path}):\n${e}`, e)
510510
})
511511
)
512512
)

0 commit comments

Comments
 (0)