From c1656bd8d220258ee2b2878dd05b40071adbdf3e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 5 Jul 2018 17:00:04 +0200 Subject: [PATCH] Print only one hint about Change-Ids at a time Change-Id: Idd6b5f63c71000c660a0167510d47fdd55904e92 --- .../git/validators/CommitValidators.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/java/com/google/gerrit/server/git/validators/CommitValidators.java b/java/com/google/gerrit/server/git/validators/CommitValidators.java index ec2d848feb..e4c7b35d0c 100644 --- a/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -335,25 +335,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); }