diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-16 17:36:12 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-16 17:36:12 -0400 |
| commit | 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c (patch) | |
| tree | 4bdb208cede00e637ce4704d942aa045f5af5ed9 /src/main/java/com/gitblit/git/PatchsetReceivePack.java | |
| parent | 07eb0963cae3a403f8774f65afa20c940ce7124f (diff) | |
| parent | 9b575e8fac8d5e17e77cc284092abd856ddec8ac (diff) | |
| download | gitblit-6b18b0761b726fd9aef1ebcc21b760378f7d4b5c.tar.gz gitblit-6b18b0761b726fd9aef1ebcc21b760378f7d4b5c.zip | |
Merge release 1.6.0
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
|