motiejus
/
jgit
1
Fork 0
Code Releases Activity

LogCommand.all(), peel references before using them 

Problem:
LogCommand.all() throws an IncorrectObjectTypeException when
there are tag references, and the repository does not contain
the file "packed-refs". It seems that the references were not properly
peeled before being added to the markStart() method.

Solution:
Call getRepository().peel() on every Ref that has isPeeled()==false
in LogCommand.all() .

Added test case for LogCommand.all() on repo with a tag.

 1. I have authored 100% of the content I'm contributing,
 2. I have the rights to donate the content to Eclipse,
 3. I contribute the content under the EDL

Bug: 402025
Change-Id: Idb8881eeb6ccce8530f2837b25296e8e83636eb7
This commit is contained in:
Arthur Baars 2013-03-04 11:14:16 +00:00
parent 4796fe7043
commit 2b9c440fd1
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LogCommandTest.java
View File

@ -51,6 +51,7 @@
import java.util.List;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.revwalk.RevCommit;
import org.junit.Test;
@ -89,6 +90,30 @@ public void logAllCommits() throws Exception {
assertFalse(log.hasNext());
}
@Test
public void logAllCommitsWithTag() throws Exception {
List<RevCommit> commits = new ArrayList<RevCommit>();
Git git = Git.wrap(db);
writeTrashFile("Test.txt", "Hello world");
git.add().addFilepattern("Test.txt").call();
commits.add(git.commit().setMessage("initial commit").call());
TagCommand tagCmd = git.tag();
tagCmd.setName("tagname");
tagCmd.setObjectId(commits.get(0));
tagCmd.setTagger(new PersonIdent(db));
Ref tag = tagCmd.call();
Iterator<RevCommit> log = git.log().all().call().iterator();
assertTrue(log.hasNext());
RevCommit commit = log.next();
tag = db.peel(tag);
assertEquals(commit.getName(), tag.getPeeledObjectId().getName());
assertTrue(commits.contains(commit));
}
private List<RevCommit> createCommits(Git git) throws Exception {
List<RevCommit> commits = new ArrayList<RevCommit>();
writeTrashFile("Test.txt", "Hello world");

2
org.eclipse.jgit/src/org/eclipse/jgit/api/LogCommand.java
View File

@ -239,6 +239,8 @@ public LogCommand addRange(AnyObjectId since, AnyObjectId until)
*/
public LogCommand all() throws IOException {
for (Ref ref : getRepository().getAllRefs().values()) {
if(!ref.isPeeled())
ref = getRepository().peel(ref);
ObjectId objectId = ref.getPeeledObjectId();
if (objectId == null)
objectId = ref.getObjectId();