Browse Source

Ensures flags won't be overwritten

main
Eric Amodio 5 years ago
parent
commit
d75ad6cd21
4 changed files with 5 additions and 5 deletions
  1. +1
    -1
      src/commands/git/fetch.ts
  2. +1
    -1
      src/commands/git/pull.ts
  3. +1
    -1
      src/commands/git/push.ts
  4. +2
    -2
      src/commands/git/stash.ts

+ 1
- 1
src/commands/git/fetch.ts View File

@ -148,7 +148,7 @@ export class FetchGitCommand extends QuickCommandBase {
state.flags = selection[0].item; state.flags = selection[0].item;
} else { } else {
state.flags = [];
state.flags = state.flags || [];
} }
this.execute(state as State); this.execute(state as State);

+ 1
- 1
src/commands/git/pull.ts View File

@ -125,7 +125,7 @@ export class PullGitCommand extends QuickCommandBase {
state.flags = selection[0].item; state.flags = selection[0].item;
} else { } else {
state.flags = [];
state.flags = state.flags || [];
} }
this.execute(state as State); this.execute(state as State);

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

@ -125,7 +125,7 @@ export class PushGitCommand extends QuickCommandBase {
state.flags = selection[0].item; state.flags = selection[0].item;
} else { } else {
state.flags = [];
state.flags = state.flags || [];
} }
this.execute(state as State); this.execute(state as State);

+ 2
- 2
src/commands/git/stash.ts View File

@ -358,7 +358,7 @@ export class StashGitCommand extends QuickCommandBase {
state.subcommand = selection[0].command; state.subcommand = selection[0].command;
state.flags = selection[0].item; state.flags = selection[0].item;
} else { } else {
state.flags = [];
state.flags = state.flags || [];
} }
void Container.git.stashApply(state.repo.path, state.stash!.stashName, state.subcommand === 'pop'); void Container.git.stashApply(state.repo.path, state.stash!.stashName, state.subcommand === 'pop');
@ -521,7 +521,7 @@ export class StashGitCommand extends QuickCommandBase {
state.flags = selection[0].item; state.flags = selection[0].item;
} else { } else {
state.flags = [];
state.flags = state.flags || [];
} }
void Container.git.stashSave(state.repo.path, state.message, state.uris, { void Container.git.stashSave(state.repo.path, state.message, state.uris, {

Loading…
Cancel
Save