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
Documentation/cmd-set-account.txt
View File

@@ -31,7 +31,7 @@ This command is intended to be used in scripts.
Required; Full name, email-address, SSH username or account id. Required; Full name, email-address, SSH username or account id.
--full-name:: --full-name::
Display name of the user account. Set the display name for the user account.
+ +
Names containing spaces should be quoted in single quotes ('). Names containing spaces should be quoted in single quotes (').
This most likely requires double quoting the value, for example This most likely requires double quoting the value, for example

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()); ChangeUtil.nextPatchSetId(args.repo, n.change().currentPatchSetId());
final PatchSet ps = new PatchSet(id); final PatchSet ps = new PatchSet(id);
ps.setCreatedOn(TimeUtil.nowTs()); ps.setCreatedOn(TimeUtil.nowTs());
ps.setUploader(submitAudit.getAccountId()); ps.setUploader(cherryPickUser.getAccountId());
ps.setRevision(new RevId(newCommit.getId().getName())); ps.setRevision(new RevId(newCommit.getId().getName()));
final RefUpdate ru; final RefUpdate ru;