summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/git/PatchsetReceivePack.java
diff options
context:
space:
mode:
authorFlorian Zschocke <florian.zschocke@cycos.com>2014-06-21 02:53:21 +0200
committerFlorian Zschocke <florian.zschocke@devolo.de>2016-10-28 11:02:25 +0200
commit5c44219084e825feea72c60a83bc6889e3cf1bc9 (patch)
tree1c2262cc18f54fa0d08579abbdd109dc3a9b54aa /src/main/java/com/gitblit/git/PatchsetReceivePack.java
parentd10fe0d8fd614f6ae6606179b0326bdc6a5f6af8 (diff)
downloadgitblit-5c44219084e825feea72c60a83bc6889e3cf1bc9.tar.gz
gitblit-5c44219084e825feea72c60a83bc6889e3cf1bc9.zip
Add integration strategy to merge tickes fast-forward or with commit.
Add the option to merge a ticket branch to the integration branch only when it can be fast-forwarded, or always with a merge commit, or by fast-foward if possible, otherwise with a merge commit. Adds a new property ticket.mergeType with the valid values FAST_FOWARD_ONLY, MERGE_ALWAYS and MERGE_IF_NECESSARY. Merging and canMerge were refactored to make use of a new IntegrationStrategy class for each type of strategy.
Diffstat (limited to 'src/main/java/com/gitblit/git/PatchsetReceivePack.java')
-rw-r--r--src/main/java/com/gitblit/git/PatchsetReceivePack.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
index 33fa4705..4a09139a 100644
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -599,7 +599,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
}
// ensure that the patchset can be cleanly merged right now
- MergeStatus status = JGitUtils.canMerge(getRepository(), tipCommit.getName(), forBranch);
+ MergeStatus status = JGitUtils.canMerge(getRepository(), tipCommit.getName(), forBranch, repository.mergeType);
switch (status) {
case ALREADY_MERGED:
sendError("");
@@ -1279,6 +1279,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
getRepository(),
patchset.tip,
ticket.mergeTo,
+ getRepositoryModel().mergeType,
committer,
message);