diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-26 07:20:05 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-26 07:20:05 -0600 |
| commit | 81a4bc5a3441bb42810c97dfe8de54e598ce39a9 (patch) | |
| tree | 4d350b1d2ee142ef1212fd5f76a3f2a2d716d87c | |
| parent | 6c874ebaa083be47aa59d3bd44fb3492e9f4df8e (diff) | |
| parent | 600d43db0c6c19fafa2f5f313170f31cc82acb9c (diff) | |
| download | gitblit-81a4bc5a3441bb42810c97dfe8de54e598ce39a9.tar.gz gitblit-81a4bc5a3441bb42810c97dfe8de54e598ce39a9.zip | |
Merged #135 "Regression in create-ticket-on-push"
| -rw-r--r-- | src/main/java/com/gitblit/git/PatchsetReceivePack.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java index d9404cb4..54ffb7ba 100644 --- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java +++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java @@ -151,6 +151,11 @@ public class PatchsetReceivePack extends GitblitReceivePack { 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);
|