From cf4e7cdb5fbbfcf0b828e35ad7df69f97010d441 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 5 Aug 2016 15:07:19 -0400 Subject: [PATCH] Clarify that submitting multiple commits is OK I've heard feedback that the message that appears when you send multiple commits for the review appears to imply that Gerrit cannot handle multiple patches in a series, and that users should avoid submitting them in favour of squashing all of their patches before submission. Of course nothing could be further from the truth, and Gerrit's ability to gracefully handle patch series is one of its major advantages over other code review tools. This changes the message to clarify that multiple self-contained patches are perfectly OK. Change-Id: Ia659149ce9332909b4bdbf09a2817a2015ebafd2 --- git_review/cmd.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/git_review/cmd.py b/git_review/cmd.py index e099ae92..563e55ff 100755 --- a/git_review/cmd.py +++ b/git_review/cmd.py @@ -898,9 +898,12 @@ def assert_one_change(remote, branch, yes, have_hook): if not yes: printwrap("You are about to submit multiple commits. This is " "expected if you are submitting a commit that is " - "dependent on one or more in-review commits. Otherwise " - "you should consider squashing your changes into one " - "commit before submitting.") + "dependent on one or more in-review commits, or if you " + "are submitting multiple self-contained but dependent " + "changes. Otherwise you should consider squashing your " + "changes into one commit before submitting (for " + "indivisible changes) or submitting from separate " + "branches (for independent changes).") print("\nThe outstanding commits are:\n\n%s\n\n" "Do you really want to submit the above commits?" % output) yes_no = do_input("Type 'yes' to confirm, other to cancel: ")