diff options
author | Han-Wen Nienhuys <hanwen@google.com> | 2018-07-05 17:00:04 +0200 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-02-04 08:56:36 +0900 |
commit | f61bc3f4f7e732742083868e93cd2ffae970be4e (patch) | |
tree | e6ba70466a9ad66d915ac532ddbdc4727c417145 | |
parent | 9c5e2cc7626c16b3e9c52d449521e1e414c97d70 (diff) |
Print only one hint about Change-Ids at a time
Change-Id: Idd6b5f63c71000c660a0167510d47fdd55904e92
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java index 12f4eb86b8..a71317f54b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -290,25 +290,26 @@ public class CommitValidators { StringBuilder sb = new StringBuilder(); sb.append("ERROR: ").append(errMsg); + boolean hinted = false; if (c.getFullMessage().contains(CHANGE_ID_PREFIX)) { String lastLine = Iterables.getLast(Splitter.on('\n').split(c.getFullMessage()), ""); if (!lastLine.contains(CHANGE_ID_PREFIX)) { + hinted = true; sb.append("\n\n") .append("Hint: run\n") .append(" git commit --amend\n") .append("and move 'Change-Id: Ixxx..' to the bottom on a separate line\n"); } } - sb.append('\n'); - sb.append('\n'); - sb.append("Hint: To automatically insert "); - sb.append(FooterConstants.CHANGE_ID.getName()); - sb.append(", install the hook:\n"); - sb.append(getCommitMessageHookInstallationHint()); - sb.append('\n'); - sb.append("And then amend the commit:\n"); - sb.append(" git commit --amend\n"); + // Print only one hint to avoid overwhelming the user. + if (!hinted) { + sb.append("Hint: to automatically insert a Change-Id, install the hook:\n") + .append(getCommitMessageHookInstallationHint()) + .append("\n") + .append("and then amend the commit:\n") + .append(" git commit --amend\n"); + } return new CommitValidationMessage(sb.toString(), false); } |