diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-26 09:09:41 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-26 09:09:41 -0400 |
| commit | ba04d6d62e443cbd23c0544094aa2e55d01b2d0f (patch) | |
| tree | 8df3e42af5390e81be617cd0aecb5ef9acd2d4ec /src/main/java/com | |
| parent | aaa4e8f82711fe228500393b1a3dd5f3f0d78911 (diff) | |
| parent | 600d43db0c6c19fafa2f5f313170f31cc82acb9c (diff) | |
| download | gitblit-ba04d6d62e443cbd23c0544094aa2e55d01b2d0f.tar.gz gitblit-ba04d6d62e443cbd23c0544094aa2e55d01b2d0f.zip | |
Merge branch 'ticket/135' into develop
Diffstat (limited to 'src/main/java/com')
| -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);
|