From 4ab184198bd7eac67eb767cf2e19423f618a70ae Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 3 Jun 2011 17:44:19 -0400 Subject: GitNotes. Unit testing. More correct refs. --- src/com/gitblit/utils/TicgitUtils.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/com/gitblit/utils/TicgitUtils.java') diff --git a/src/com/gitblit/utils/TicgitUtils.java b/src/com/gitblit/utils/TicgitUtils.java index 576de349..8224d1cb 100644 --- a/src/com/gitblit/utils/TicgitUtils.java +++ b/src/com/gitblit/utils/TicgitUtils.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.List; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +65,8 @@ public class TicgitUtils { if (ticgitBranch == null) { return null; } - List paths = JGitUtils.getFilesInPath(r, null, ticgitBranch.commit); + RevCommit commit = (RevCommit) ticgitBranch.referencedObject; + List paths = JGitUtils.getFilesInPath(r, null, commit); List tickets = new ArrayList(); for (PathModel ticketFolder : paths) { if (ticketFolder.isTree()) { @@ -97,11 +99,10 @@ public class TicgitUtils { } private static void readTicketContents(Repository r, RefModel ticketsBranch, TicketModel ticket) { - List ticketFiles = JGitUtils - .getFilesInPath(r, ticket.name, ticketsBranch.commit); + RevCommit commit = (RevCommit) ticketsBranch.referencedObject; + List ticketFiles = JGitUtils.getFilesInPath(r, ticket.name, commit); for (PathModel file : ticketFiles) { - String content = JGitUtils.getRawContentAsString(r, ticketsBranch.commit, file.path) - .trim(); + String content = JGitUtils.getStringContent(r, commit.getTree(), file.path).trim(); if (file.name.equals("TICKET_ID")) { ticket.id = content; } else if (file.name.equals("TITLE")) { -- cgit v1.2.3