Browse Source

Makes compare node first again

main
Eric Amodio 4 years ago
parent
commit
bf44265fd8
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      src/views/nodes/branchNode.ts

+ 6
- 4
src/views/nodes/branchNode.ts View File

@ -124,15 +124,15 @@ export class BranchNode
]);
if (log == null) return [new MessageNode(this.view, this, 'No commits could be found.')];
if (pr != null) {
children.push(new PullRequestNode(this.view, this, pr, this.branch));
}
if (this.options.showTracking) {
if (this.options.showComparison !== false && this.view instanceof CommitsView) {
children.push(new CompareBranchNode(this.uri, this.view, this, this.branch));
}
if (pr != null) {
children.push(new PullRequestNode(this.view, this, pr, this.branch));
}
const status = {
ref: this.branch.ref,
repoPath: this.branch.repoPath,
@ -161,6 +161,8 @@ export class BranchNode
new BranchTrackingStatusNode(this.view, this, this.branch, status, 'none', this.root),
);
}
} else if (pr != null) {
children.push(new PullRequestNode(this.view, this, pr, this.branch));
}
if (children.length !== 0) {

Loading…
Cancel
Save