James Moger
2014-09-26 81a4bc5a3441bb42810c97dfe8de54e598ce39a9
Merged #135 "Regression in create-ticket-on-push"
1 files modified
5 ■■■■■ changed files
src/main/java/com/gitblit/git/PatchsetReceivePack.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -151,6 +151,11 @@
            LOGGER.error("failed to determine default branch for " + repository.name, e);
        }
        if (!StringUtils.isEmpty(getRepositoryModel().mergeTo)) {
            // repository settings specifies a default integration branch
            defaultBranch = Repository.shortenRefName(getRepositoryModel().mergeTo);
        }
        long ticketId = 0L;
        try {
            ticketId = Long.parseLong(branch);