diff options
| author | Sven Selberg <svense@axis.com> | 2016-11-07 14:45:47 +0100 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2016-11-08 11:12:02 +0900 |
| commit | 85d7ee4fb09d74ca1fe23ac76973194f672af0e0 (patch) | |
| tree | 799ae20a04bd479a22ddcd358e9f3cfc2486c8da | |
| parent | 1ef6e50b0a0649958fa85ff16cbe8efbea9894e8 (diff) | |
CherryPick: Update mergeTip for every cherry-pick
When updating mergeTip in updateChanges mergeTip is not updated
between cherry-picks so all commits in Batch will be done on tip of
target branch, not stacked on each other.
Bug: Issue 4887
Change-Id: I59ce9f60eba08e44dd1e9a8ac1a9c953ed066570
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java index e2f869f2f0..ecac2b3536 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java @@ -158,6 +158,7 @@ public class CherryPick extends SubmitStrategy { newCommit = args.mergeUtil.createCherryPickFromCommit( args.repo, args.inserter, mergeTip.getCurrentTip(), toMerge, committer, cherryPickCmtMsg, args.rw); + mergeTip.moveTipTo(newCommit, newCommit); ctx.addRefUpdate( new ReceiveCommand(ObjectId.zeroId(), newCommit, psId.toRefName())); patchSetInfo = @@ -200,7 +201,6 @@ public class CherryPick extends SubmitStrategy { newCommit.setStatusCode(CommitMergeStatus.CLEAN_PICK); newCommit.setControl( args.changeControlFactory.controlFor(toMerge.change(), args.caller)); - mergeTip.moveTipTo(newCommit, newCommit); newCommits.put(c.getId(), newCommit); setRefLogIdent(); } |