commit 29d5cf85ac28d9ef59228e8805ab7b1078baa667
author Gregory Nisbet <gregorynisbet@google.com> Thu Feb 27 08:16:58 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Feb 27 08:16:58 2020 +0000
tree 5e2275a426fff2a365a4a2a9b53a4ba33ee1b152
parent 005269a51304917aed6d5f371bfe7f131f8cd248

fix git cl presubmit

BUG=chromium:1056534
TEST=run git cl presubmit

Change-Id: I22a7951623b241b8b1cc49f107f024d95054506d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2077357
Auto-Submit: Gregory Nisbet <gregorynisbet@google.com>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index 4d89021..7a96d24 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2023,7 +2023,7 @@
       if self.GetIssue():
         description = self.FetchDescription()
       else:
-        description = self.GetDescription(upstream)
+        description = self.GetLocalDescription(upstream)
       self.RunHook(
           committing=True,
           may_prompt=not force,
@@ -4127,10 +4127,10 @@
     # Default to diffing against the common ancestor of the upstream branch.
     base_branch = cl.GetCommonAncestorWithUpstream()
 
-  if self.GetIssue():
-    description = self.FetchDescription()
+  if cl.GetIssue():
+    description = cl.FetchDescription()
   else:
-    description = self.GetDescription(base_branch)
+    description = cl.GetLocalDescription(base_branch)
 
   cl.RunHook(
       committing=not options.upload,