commit b54d0f013b6cd519671280186b8a39eb303cb080
author Joanna Wang <jojwang@chromium.org> Fri Feb 24 23:10:19 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Feb 24 23:10:19 2023 +0000
tree 74b90538b034297cc4ca7700b08f10dfa55aec82
parent eee53367c1fab7b7ca150ee45aacafb4103c4ed2

Only trigger stacked changes dogfood path when in squash mode.

Bug: 1419551
Change-Id: Idbc345798ba81c3e1abd2038db8fadbef0b7391e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4291331
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
Auto-Submit: Joanna Wang <jojwang@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index b1ba096..3c8e4ac 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -4762,7 +4762,7 @@
     # Load default for user, repo, squash=true, in this order.
     options.squash = settings.GetSquashGerritUploads()
 
-  if os.environ.get('DOGFOOD_STACKED_CHANGES') == '1':
+  if options.squash and os.environ.get('DOGFOOD_STACKED_CHANGES') == '1':
     if options.dependencies:
       parser.error('--dependencies is not available for this workflow.')