Browse Source

Fixes issue with pull/push on some nodes

main
Eric Amodio 4 years ago
parent
commit
103670c7a9
1 changed files with 6 additions and 7 deletions
  1. +6
    -7
      src/views/viewCommands.ts

+ 6
- 7
src/views/viewCommands.ts View File

@ -351,22 +351,21 @@ export class ViewCommands {
@debug() @debug()
private pull(node: RepositoryNode | BranchNode | BranchTrackingStatusNode) { private pull(node: RepositoryNode | BranchNode | BranchTrackingStatusNode) {
if (node instanceof RepositoryNode) return GitActions.pull(node.repo);
if (node instanceof BranchNode || node instanceof BranchTrackingStatusNode) { if (node instanceof BranchNode || node instanceof BranchTrackingStatusNode) {
node = node.getParent() as RepositoryNode;
return GitActions.pull(node.repoPath);
} }
if (!(node instanceof RepositoryNode)) return Promise.resolve();
return GitActions.pull(node.repo);
return Promise.resolve();
} }
@debug() @debug()
private push(node: RepositoryNode | BranchNode | BranchTrackingStatusNode, force?: boolean) { private push(node: RepositoryNode | BranchNode | BranchTrackingStatusNode, force?: boolean) {
if (node instanceof RepositoryNode) return GitActions.push(node.repo, force);
if (node instanceof BranchNode || node instanceof BranchTrackingStatusNode) { if (node instanceof BranchNode || node instanceof BranchTrackingStatusNode) {
node = node.getParent() as RepositoryNode;
return GitActions.push(node.repoPath, force);
} }
if (!(node instanceof RepositoryNode)) return Promise.resolve();
return GitActions.push(node.repo, force);
return Promise.resolve();
} }
@debug() @debug()

Loading…
Cancel
Save