Tag server-side merges when incremental push tags are enabled

James Moger

2014-05-23 d62d883423c4f13e9514c203d2f0b14e4715df7f

 src/main/java/com/gitblit/git/PatchsetReceivePack.java

@@ -1202,11 +1202,15 @@
      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