Skip to content

Update Checkout and Merge #505

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
tbranyen merged 4 commits into from
Mar 22, 2015
Merged

Update Checkout and Merge #505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f613b52
Checkout branch with tree instead of head
orderedlist Mar 21, 2015
a4a4c8b
Properly update the index on Merge FF
orderedlist Mar 19, 2015
5bffb8d
Remove only from tests
orderedlist Mar 21, 2015
7775aa7
Fast forward checking out the tree instead of the head
orderedlist Mar 22, 2015
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
Prev Previous commit
Fast forward checking out the tree instead of the head 
Don't need to manipulate the index in this scenario
  • Loading branch information
@orderedlist
orderedlist committed Mar 22, 2015
commit 7775aa70c1dd296996054af71a14b2b50d52c210
21 changes: 9 additions & 12 deletions lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,24 +661,22 @@ Repository.prototype.mergeBranches = function(to, from, signature) {
var repo = this;
var fromBranch;
var toBranch;
var headCommit;

signature = signature || repo.defaultSignature();

return Promise.all([
repo.getBranch(to),
repo.getBranch(from),
repo.getHeadCommit()
repo.getBranch(to),
repo.getBranch(from)
]).then(function(objects) {
toBranch = objects[0];
fromBranch = objects[1];
headCommit = objects[2];

return Promise.all([
repo.getBranchCommit(toBranch),
repo.getBranchCommit(fromBranch)
]);
}).then(function(branchCommits) {
})
.then(function(branchCommits) {
var toCommitOid = branchCommits[0].toString();
var fromCommitOid = branchCommits[1].toString();

Expand All @@ -699,13 +697,12 @@ Repository.prototype.mergeBranches = function(to, from, signature) {

return branchCommits[1].getTree()
.then(function(tree) {
if (headCommit.toString() == toCommitOid) {
if (toBranch.isHead()) {
// Checkout the tree if we're on the branch
var opts = {checkoutStrategy: NodeGit.Checkout.STRATEGY.SAFE};
var opts = {
checkoutStrategy: NodeGit.Checkout.STRATEGY.SAFE_CREATE
};
return NodeGit.Checkout.tree(repo, tree, opts);
} else {
// Otherwise, just point the ref
return;
}
})
.then(function() {
Expand All @@ -716,7 +713,7 @@ Repository.prototype.mergeBranches = function(to, from, signature) {
.then(function() {
return fromCommitOid;
});
})
});
}
else {
// We have to merge. Lets do it!
Expand Down
11 changes: 11 additions & 0 deletions test/tests/merge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,10 @@ describe("Merge", function() {
theirCommit = commit;
});
})
.then(function() {
var opts = {checkoutStrategy: NodeGit.Checkout.STRATEGY.FORCE};
return repository.checkoutBranch(ourBranchName, opts);
})
.then(function() {
return repository.mergeBranches(
ourBranchName,
Expand All @@ -228,6 +232,13 @@ describe("Merge", function() {
.then(function(branchCommit) {
assert.equal(oid.toString(), branchCommit.toString());
});
})
.then(function() {
return repository.getStatus();
})
.then(function(statuses) {
// make sure we didn't change the index
assert.equal(statuses.length, 0);
});
});

Expand Down