commit 1062500617a0fada2a99bb13e727668b78a2ad2d
author tandrii@chromium.org <tandrii@chromium.org> Fri Mar 04 20:03:47 2016 +0000
committer tandrii@chromium.org <tandrii@chromium.org> Fri Mar 04 20:03:47 2016 +0000
tree ee2d1fff3603a57904b3ba42ce2979d76adfe7b2
parent 675bec320d3a363822f705a7414b35146f6b733c

git cl: stop downloading Gerrit commit-hook with --squash mode.

BUG=579176

Review URL: https://codereview.chromium.org/1760063002

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

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 1666f33..d236e85 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -600,10 +600,6 @@
       cr_settings_file = FindCodereviewSettingsFile()
       if autoupdate != 'false' and cr_settings_file:
         LoadCodereviewSettingsFromFile(cr_settings_file)
-        # set updated to True to avoid infinite calling loop
-        # through DownloadGerritHook
-        self.updated = True
-        DownloadGerritHook(False)
       self.updated = True
 
   def GetDefaultServerUrl(self, error_ok=False):
@@ -2244,6 +2240,7 @@
                           '-m', message]).strip()
   else:
     if not git_footers.get_footer_change_id(change_desc.description):
+      DownloadGerritHook(False)
       AddChangeIdToCommitMessage(options, args)
     ref_to_push = 'HEAD'
     parent = '%s/%s' % (gerrit_remote, branch)