diff options
| author | James Moger <james.moger@gmail.com> | 2016-10-28 16:04:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 16:04:40 -0400 |
| commit | d64dd5de6cf6385d77dcd6014f1ce48369cf9ade (patch) | |
| tree | d104751eb03d4cacce2560d4f6684836dd692379 /src/main/java/com/gitblit/git/PatchsetReceivePack.java | |
| parent | bac124176649617171a0d4be4b0a4edcfa073776 (diff) | |
| parent | 355cbb8f10527032e9c9cedbef5b68f118418d68 (diff) | |
| download | gitblit-d64dd5de6cf6385d77dcd6014f1ce48369cf9ade.tar.gz gitblit-d64dd5de6cf6385d77dcd6014f1ce48369cf9ade.zip | |
Merge pull request #1142 from fzs/merge-strategy
Merge strategy
Diffstat (limited to 'src/main/java/com/gitblit/git/PatchsetReceivePack.java')
| -rw-r--r-- | src/main/java/com/gitblit/git/PatchsetReceivePack.java | 3 |
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);
|