Skip to content

Add mergeOptions to Repository#mergeBranches #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaley81 merged 1 commit into from
Jan 22, 2016
Merged

Add mergeOptions to Repository#mergeBranches #873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,23 +725,25 @@ Repository.prototype.fetchAll = function(
});
};


/**
* Merge a branch onto another branch
*
* @param {String|Ref} to
* @param {String|Ref} from
* @param {Signature} signature
* @param {Merge.PREFERENCE} mergePreference
* @param {MergeOptions} mergeOptions
* @return {Oid|Index} A commit id for a succesful merge or an index for a
* merge with conflicts
*/
Repository.prototype.mergeBranches =
function(to, from, signature, mergePreference) {
function(to, from, signature, mergePreference, mergeOptions) {
var repo = this;
var fromBranch;
var toBranch;

mergePreference = mergePreference || NodeGit.Merge.PREFERENCE.NONE;
mergeOptions = normalizeOptions(mergeOptions, NodeGit.MergeOptions);

signature = signature || repo.defaultSignature();

Expand Down Expand Up @@ -806,7 +808,12 @@ Repository.prototype.mergeBranches =
})
.then(function(headRef) {
updateHead = !!headRef && (headRef.name() === toBranch.name());
return NodeGit.Merge.commits(repo, toCommitOid, fromCommitOid);
return NodeGit.Merge.commits(
repo,
toCommitOid,
fromCommitOid,
mergeOptions
);
})
.then(function(index) {
// if we have conflicts then throw the index
Expand Down Expand Up @@ -834,8 +841,8 @@ Repository.prototype.mergeBranches =
[toCommitOid, fromCommitOid]);
})
.then(function(commit) {
// // we've updated the checked out branch, so make sure we update
// // head so that our index isn't messed up
// we've updated the checked out branch, so make sure we update
// head so that our index isn't messed up
if (updateHead) {
return repo.getBranch(to)
.then(function(branch) {
Expand Down