| | |
|---|
| | | break;
|
|---|
| | | }
|
|---|
| | | }
|
|---|
| | | sendError("Sorry, {0} already merged {1} from ticket {2,number,0} to {3}!",
|
|---|
| | | if (mergeChange != null) {
|
|---|
| | | sendError("Sorry, {0} already merged {1} from ticket {2,number,0} to {3}!",
|
|---|
| | | mergeChange.author, mergeChange.patchset, number, ticket.mergeTo);
|
|---|
| | | }
|
|---|
| | | sendRejection(cmd, "Ticket {0,number,0} already resolved", number);
|
|---|
| | | return null;
|
|---|
| | | } else if (!StringUtils.isEmpty(ticket.mergeTo)) {
|
|---|
| | |
|---|
| | | if (ticket != null) {
|
|---|
| | | ticketNotifier.queueMailing(ticket);
|
|---|
| | |
|
|---|
| | | // update the reflog with the merge
|
|---|
| | | if (oldRef != null) {
|
|---|
| | | ReceiveCommand cmd = new ReceiveCommand(oldRef.getObjectId(),
|
|---|
| | | ObjectId.fromString(mergeResult.sha), oldRef.getName());
|
|---|
| | | RefLogUtils.updateRefLog(user, getRepository(), Arrays.asList(cmd));
|
|---|
| | | cmd.setResult(Result.OK);
|
|---|
| | | List<ReceiveCommand> commands = Arrays.asList(cmd);
|
|---|
| | |
|
|---|
| | | logRefChange(commands);
|
|---|
| | | updateIncrementalPushTags(commands);
|
|---|
| | | updateGitblitRefLog(commands);
|
|---|
| | | }
|
|---|
| | |
|
|---|
| | | // call patchset hooks
|
|---|
