github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

It's fine if there isn't an upstream.

Browse Source
This commit is contained in:
joshaber
2015-12-09 23:54:12 -05:00
parent ab94103497
commit cdf1029698
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/git-repository-async.js
View File

@@ -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}