Skip to content

make checkoutBranch works with branches that lives outside of refs/heads #891

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 3 commits into from
Feb 29, 2016
Merged

make checkoutBranch works with branches that lives outside of refs/heads #891

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9120067
make checkoutBranch works with branches that lives outside of refs/heads
AsoSunag Feb 3, 2016
816a3af
extract a checkoutRef method from checkoutBranch for references outsi…
AsoSunag Feb 5, 2016
81dc218
fix checkoutRef
AsoSunag Feb 5, 2016
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: 26 additions & 13 deletions lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,30 +1128,22 @@ Repository.prototype.getSubmoduleNames = function(callback) {
};

/**
* This will set the HEAD to point to the local branch and then attempt
* This will set the HEAD to point to the reference and then attempt
* to update the index and working tree to match the content of the
* latest commit on that branch
* latest commit on that reference
*
* @async
* @param {String|Reference} branch the branch to checkout
* @param {Reference} reference the reference to checkout
* @param {Object|CheckoutOptions} opts the options to use for the checkout
*/
Repository.prototype.checkoutBranch = function(branch, opts) {
Repository.prototype.checkoutRef = function(reference, opts) {
var repo = this;
var reference;
opts = opts || {};

opts.checkoutStrategy = opts.checkoutStrategy ||
(NodeGit.Checkout.STRATEGY.SAFE |
NodeGit.Checkout.STRATEGY.RECREATE_MISSING);
return repo.getReference(branch)
.then(function(ref) {
if (!ref.isBranch()) {
return false;
}
reference = ref;
return repo.getBranchCommit(ref.name());
})
return repo.getReferenceCommit(reference.name())
.then(function(commit) {
return commit.getTree();
})
Expand All @@ -1164,6 +1156,27 @@ Repository.prototype.checkoutBranch = function(branch, opts) {
});
};

/**
* This will set the HEAD to point to the local branch and then attempt
* to update the index and working tree to match the content of the
* latest commit on that branch
*
* @async
* @param {String|Reference} branch the branch to checkout
* @param {Object|CheckoutOptions} opts the options to use for the checkout
*/
Repository.prototype.checkoutBranch = function(branch, opts) {
var repo = this;

return repo.getReference(branch)
.then(function(ref) {
if (!ref.isBranch()) {
return false;
}
return repo.checkoutRef(ref, opts);
});
};

var fetchheadForeach = Repository.prototype.fetchheadForeach;
/**
* @async
Expand Down