diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-17 16:06:23 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-17 16:06:23 -0400 |
| commit | 5785497bca7d8c18b76d9d18333a1ece0372a8e6 (patch) | |
| tree | 0c36abceed8cf5f6fb6e65e3a27237d38573ebc0 /src/main/java/com | |
| parent | 588a4f925f5ac6ff80674c047bf147528cb8bbb3 (diff) | |
| parent | ab9c0ce1bbd67dbb1236312123a3e24a74e097c6 (diff) | |
| download | gitblit-5785497bca7d8c18b76d9d18333a1ece0372a8e6.tar.gz gitblit-5785497bca7d8c18b76d9d18333a1ece0372a8e6.zip | |
Merge branch 'ticket/183' into develop
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/gitblit/tickets/BranchTicketService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/tickets/BranchTicketService.java b/src/main/java/com/gitblit/tickets/BranchTicketService.java index 8a2bc951..42189bfd 100644 --- a/src/main/java/com/gitblit/tickets/BranchTicketService.java +++ b/src/main/java/com/gitblit/tickets/BranchTicketService.java @@ -828,8 +828,12 @@ public class BranchTicketService extends ITicketService implements RefsChangedLi List<DirCacheEntry> list = new ArrayList<DirCacheEntry>(); TreeWalk tw = null; try { - tw = new TreeWalk(db); ObjectId treeId = db.resolve(BRANCH + "^{tree}"); + if (treeId == null) { + // branch does not exist yet, could be migrating tickets + return list; + } + tw = new TreeWalk(db); int hIdx = tw.addTree(treeId); tw.setRecursive(true); |