opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9' into stable-2.10

Browse Source 
* stable-2.9:
  Fix description of set-account command's --full-name option
  Fix potential NPE in cherry-pick submit strategy

Change-Id: Id71a566e7debd3c7f18346f1a435c1ea24e5d2cb
This commit is contained in:
David Pursehouse
2014-08-20 16:36:37 +09:00
parent 8b0e2b0a74 9c0325578f
commit 0409483bf5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
View File

@@ -164,7 +164,7 @@ public class CherryPick extends SubmitStrategy {
ChangeUtil.nextPatchSetId(args.repo, n.change().currentPatchSetId());
final PatchSet ps = new PatchSet(id);
ps.setCreatedOn(TimeUtil.nowTs());
ps.setUploader(submitAudit.getAccountId());
ps.setUploader(cherryPickUser.getAccountId());
ps.setRevision(new RevId(newCommit.getId().getName()));
final RefUpdate ru;