github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return null when no merge base is found

Browse Source
This commit is contained in:
Kevin Sawicki
2013-03-04 21:56:14 -08:00
parent 60c2829af4
commit eb00623807
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
native/v8_extensions/git.mm
View File

@@ -156,7 +156,6 @@ namespace v8_extensions {
}
CefRefPtr<CefV8Value> GetAheadBehindCounts() {
CefRefPtr<CefV8Value> result = CefV8Value::CreateObject(NULL);
git_reference *head;
if (git_repository_head(&head, repo) == GIT_OK) {
const char* upstreamBranchName;
@@ -168,10 +167,12 @@ namespace v8_extensions {
const git_oid* upstreamSha = git_reference_target(upstream);
git_oid mergeBase;
if (git_merge_base(&mergeBase, repo, headSha, upstreamSha) == GIT_OK) {
CefRefPtr<CefV8Value> result = CefV8Value::CreateObject(NULL);
int ahead = GetCommitCount(headSha, &mergeBase);
result->SetValue("ahead", CefV8Value::CreateInt(ahead), V8_PROPERTY_ATTRIBUTE_NONE);
int behind = GetCommitCount(upstreamSha, &mergeBase);
result->SetValue("behind", CefV8Value::CreateInt(behind), V8_PROPERTY_ATTRIBUTE_NONE);
return result;
}
git_reference_free(upstream);
}
@@ -179,7 +180,8 @@ namespace v8_extensions {
}
git_reference_free(head);
}
return result;
return CefV8Value::CreateNull();
}
CefRefPtr<CefV8Value> IsIgnored(const char *path) {