commit b067ec53726f79a5fea929ca67605f81dd413422
author tandrii@chromium.org <tandrii@chromium.org> Tue May 31 15:24:44 2016 +0000
committer tandrii@chromium.org <tandrii@chromium.org> Tue May 31 15:24:44 2016 +0000
tree 43a30602d7200b9a1c2d9628a677b826ed20ad67
parent cbd7dc3ce5afcc828da1d13d2c1854e004cb0350

git cl upload: die when --no-squash has no commit-msg-hook.

Otherwise, the program continues, and an exception is printed.
The message is still there, but easy to miss.

R=andybons@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2004303003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@300674 0039d316-1c4b-4281-b951-d872f2087c98

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index e19d38c..35785eb 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2528,7 +2528,7 @@
       print 'git-cl: Added Change-Id to commit message.'
       return new_log_desc
     else:
-      print >> sys.stderr, 'ERROR: Gerrit commit-msg hook not available.'
+      DieWithError('ERROR: Gerrit commit-msg hook not installed.')
 
   def SetCQState(self, new_state):
     """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""