commit bcba1782123e426901b0e436edf1c444ae5aeb70
author Joanna Wang <jojwang@google.com> Tue Sep 12 22:48:05 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 12 22:48:05 2023 +0000
tree fbc9a344aa0721851296ac7b18136335ec181bbb
parent 7379a9299fccacba61561a5cee5b837ccd9ad7b4

Add missing --no-ext-diff when getting external changes.

Bug: 1441663
Change-Id: I66fc01e486ddddb6b8c296d1ed4faf22141b845e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4859062
Auto-Submit: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Joanna Wang <jojwang@chromium.org>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index c558bac..c4789df 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -3384,8 +3384,10 @@
                 'Continue with upload and override the latest changes?')
             return
 
-        diff = RunGitSilent(
-            ['diff', '%s..%s' % (last_uploaded, latest_external)])
+        diff = RunGitSilent([
+            'diff', '--no-ext-diff',
+            '%s..%s' % (last_uploaded, latest_external)
+        ])
 
         # Diff can be empty in the case of trivial rebases.
         if not diff: