diff options
| author | James Moger <james.moger@gitblit.com> | 2014-05-23 09:01:28 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-05-23 09:19:01 -0400 |
| commit | d62d883423c4f13e9514c203d2f0b14e4715df7f (patch) | |
| tree | 824159bccf283d25ccb05539c3190dd70c66133e /src/main/java/com/gitblit/git/PatchsetReceivePack.java | |
| parent | 35c1d254a8aebe3e5ee4edd4a9fb17b024c719f2 (diff) | |
| download | gitblit-d62d883423c4f13e9514c203d2f0b14e4715df7f.tar.gz gitblit-d62d883423c4f13e9514c203d2f0b14e4715df7f.zip | |
Tag server-side merges when incremental push tags are enabled
Diffstat (limited to 'src/main/java/com/gitblit/git/PatchsetReceivePack.java')
| -rw-r--r-- | src/main/java/com/gitblit/git/PatchsetReceivePack.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java index f7412a34..9e55524d 100644 --- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java +++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java @@ -1202,11 +1202,15 @@ public class PatchsetReceivePack extends GitblitReceivePack { 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
|