From cdf1029698bd5d76822acf0b3ba64ea1264dee98 Mon Sep 17 00:00:00 2001 From: joshaber Date: Wed, 9 Dec 2015 23:54:12 -0500 Subject: [PATCH] It's fine if there isn't an upstream. --- src/git-repository-async.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/git-repository-async.js b/src/git-repository-async.js index 116f52216..42e53f105 100644 --- a/src/git-repository-async.js +++ b/src/git-repository-async.js @@ -210,7 +210,10 @@ export default class GitRepositoryAsync { getAheadBehindCount (reference, _path) { return this._getRepo(_path) .then(repo => Promise.all([repo, repo.getBranch(reference)])) - .then(([repo, local]) => Promise.all([repo, local, Git.Branch.upstream(local)])) + .then(([repo, local]) => { + const upstream = Git.Branch.upstream(local).catch(_ => null) + return Promise.all([repo, local, upstream]) + }) .then(([repo, local, upstream]) => { if (!upstream) return {ahead: 0, behind: 0}