MCPcopy Create free account
hub / github.com/codereader/DarkRadiant / findMergeBase

Method findMergeBase

plugins/vcs/Repository.cpp:446–465  ·  view source on GitHub ↗

Source from the content-addressed store, hash-verified

444}
445
446Commit::Ptr Repository::findMergeBase(const Reference& first, const Reference& second)
447{
448 git_oid firstOid;
449 auto error = git_reference_name_to_id(&firstOid, _repository, first.getName().c_str());
450 GitException::ThrowOnError(error);
451
452 git_oid secondOid;
453 error = git_reference_name_to_id(&secondOid, _repository, second.getName().c_str());
454 GitException::ThrowOnError(error);
455
456 git_oid mergeBase;
457 error = git_merge_base(&mergeBase, _repository, &firstOid, &secondOid);
458 GitException::ThrowOnError(error);
459
460 git_commit* commit;
461 error = git_commit_lookup(&commit, _repository, &mergeBase);
462 GitException::ThrowOnError(error);
463
464 return std::make_shared<Commit>(commit);
465}
466
467std::shared_ptr<Diff> Repository::getDiff(const Reference& ref, Commit& commit)
468{

Callers 3

analyseRemoteStatusFunction · 0.80
performFastForwardFunction · 0.80
syncWithRemoteFunction · 0.80

Calls 2

c_strMethod · 0.45
getNameMethod · 0.45

Tested by

no test coverage detected