Browse Source

Fixes push confirm message when not ahead

main
Eric Amodio 4 years ago
parent
commit
48738a1b83
1 changed files with 10 additions and 1 deletions
  1. +10
    -1
      src/commands/git/push.ts

+ 10
- 1
src/commands/git/push.ts View File

@ -302,7 +302,7 @@ export class PushGitCommand extends QuickCommand {
undefined, undefined,
{ placeholder: 'Confirm Publish' }, { placeholder: 'Confirm Publish' },
); );
} else {
} else if (status.upstream == null) {
step = this.createConfirmStep( step = this.createConfirmStep(
appendReposToTitle('Confirm Publish', state, context), appendReposToTitle('Confirm Publish', state, context),
[], [],
@ -312,6 +312,15 @@ export class PushGitCommand extends QuickCommand {
}), }),
{ placeholder: 'Confirm Publish' }, { placeholder: 'Confirm Publish' },
); );
} else {
step = this.createConfirmStep(
appendReposToTitle('Confirm Push', state, context),
[],
DirectiveQuickPickItem.create(Directive.Cancel, true, {
label: `Cancel ${this.title}`,
detail: `Cannot push; No commits ahead of ${GitBranch.getRemote(status.upstream)}`,
}),
);
} }
} else { } else {
let lastFetchedOn = ''; let lastFetchedOn = '';

Loading…
Cancel
Save