diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-17 14:16:16 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-17 14:16:16 -0600 |
| commit | d402f4ef29fc4b2b6a6376d03211b2941b77d72d (patch) | |
| tree | 962d0021c32455c579b4eb745ac602abf6252bb3 | |
| parent | 0815f032dedf0bf1f0d60d543f5f1836d9086c8e (diff) | |
| parent | ab9c0ce1bbd67dbb1236312123a3e24a74e097c6 (diff) | |
| download | gitblit-d402f4ef29fc4b2b6a6376d03211b2941b77d72d.tar.gz gitblit-d402f4ef29fc4b2b6a6376d03211b2941b77d72d.zip | |
Merged #183 "Fix bug in migrating to BranchTicketService"
| -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 8c000550..5a42c6a7 100644 --- a/src/main/java/com/gitblit/tickets/BranchTicketService.java +++ b/src/main/java/com/gitblit/tickets/BranchTicketService.java @@ -823,8 +823,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); |