Skip to content

Fix symbolic reference handling in getReferences #496

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
Mar 20, 2015
+25 −32
Merged

Fix symbolic reference handling in getReferences #496

Show file tree
Hide file tree
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
23 changes: 9 additions & 14 deletions examples/general.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,23 +343,18 @@ nodegit.Repository.open(path.resolve(__dirname, "../.git"))
// references such as branches, tags and remote references (everything in
// the .git/refs directory).

return repo.getReferenceNames(nodegit.Reference.TYPE.ALL);
return nodegit.Repository.getReferences(repo,
nodegit.Reference.TYPE.LISTALL, false, true);
})

.then(function(referenceNames) {
var promises = [];

referenceNames.forEach(function(referenceName) {
promises.push(repo.getReference(referenceName).then(function(reference) {
if (reference.isConcrete()) {
console.log("Reference:", referenceName, reference.target());
} else if (reference.isSymbolic()) {
console.log("Reference:", referenceName, reference.symbolicTarget());
}
}));
.then(function(references) {
references.forEach(function(reference) {
if (reference.isConcrete()) {
console.log("Reference:", reference.name(), reference.target());
} else if (reference.isSymbolic()) {
console.log("Reference:", reference.name(), reference.symbolicTarget());
}
});

return Promise.all(promises);
})

.done(function() {
Expand Down
34 changes: 16 additions & 18 deletions lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,29 +145,27 @@ Repository.prototype.getReference = function(name, callback) {
}, callback);
};

Repository.getReferences = function(repo, type, refNamesOnly, callback) {
Repository.getReferences =
function(repo, type, refNamesOnly, includeSymbolic, callback) {
if (!callback && typeof includeSymbolic === "function") {
callback = includeSymbolic;
includeSymbolic = false;
}
return Reference.list(repo).then(function(refList) {
var refFilterPromises = [];
var filteredRefs = [];

refList.forEach(function(refName) {
refFilterPromises.push(Reference.lookup(repo, refName)
.then(function(ref) {
if (type == Reference.TYPE.ALL || ref.type() == type) {
if (refNamesOnly) {
filteredRefs.push(refName);
return;
}

if (ref.isSymbolic()) {
return ref.resolve().then(function(resolvedRef) {
resolvedRef.repo = repo;

filteredRefs.push(resolvedRef);
});
}
else {
filteredRefs.push(ref);
if (type == Reference.TYPE.LISTALL || ref.type() == type) {
if (!ref.isSymbolic() || includeSymbolic) {
if (refNamesOnly) {
filteredRefs.push(refName);
}
else {
filteredRefs.push(ref);
}
}
}
})
Expand All @@ -192,7 +190,7 @@ Repository.getReferences = function(repo, type, refNamesOnly, callback) {
* @return {Array<Reference>}
*/
Repository.prototype.getReferences = function(type, callback) {
return Repository.getReferences(this, type, false, callback);
return Repository.getReferences(this, type, false, false, callback);
};

/**
Expand All @@ -203,7 +201,7 @@ Repository.prototype.getReferences = function(type, callback) {
* @return {Array<String>}
*/
Repository.prototype.getReferenceNames = function(type, callback) {
return Repository.getReferences(this, type, true, callback);
return Repository.getReferences(this, type, true, false, callback);
};

/**
Expand Down