Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Update merge branches with processMergeMessageCallback #1219

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 2 commits into from
Feb 26, 2017
Merged

Update merge branches with processMergeMessageCallback #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92833d6
Update merge branches with processMergeMessageCallback
implausible Feb 8, 2017
96e03dc
end quote comes after the shorthand
implausible Feb 10, 2017
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
39 changes: 33 additions & 6 deletions 39 lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,11 +1325,19 @@ Repository.prototype.refreshIndex = function(callback) {
* @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, mergeOptions) {
Repository.prototype.mergeBranches = function(
to,
from,
signature,
mergePreference,
mergeOptions,
processMergeMessageCallback
) {
var repo = this;
var fromBranch;
var toBranch;
processMergeMessageCallback = processMergeMessageCallback ||
function (message) { return message; };

mergePreference = mergePreference || NodeGit.Merge.PREFERENCE.NONE;
mergeOptions = normalizeOptions(mergeOptions, NodeGit.MergeOptions);
Expand Down Expand Up @@ -1414,19 +1422,38 @@ Repository.prototype.mergeBranches =
return index.writeTreeTo(repo);
})
.then(function(oid) {
var mergeDecorator;
if (fromBranch.isTag()) {
mergeDecorator = "tag";
} else if (fromBranch.isRemote()) {
mergeDecorator = "remote-tracking branch";
} else {
mergeDecorator = "branch";
}

var message =
"Merged " +
"Merge " +
mergeDecorator +
" '" +
fromBranch.shorthand() +
" into " +
toBranch.shorthand();
"'";

// https://github.com/git/git/blob/master/builtin/fmt-merge-msg.c#L456-L459
if (toBranch.shorthand() !== "master") {
message += " into " + toBranch.shorthand();
}

return Promise.all([oid, processMergeMessageCallback(message)]);
})
.then(function([oid, message]) {
return repo.createCommit(
toBranch.name(),
signature,
signature,
message,
oid,
[toCommitOid, fromCommitOid]);
[toCommitOid, fromCommitOid]
);
})
.then(function(commit) {
// we've updated the checked out branch, so make sure we update
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.