From b54d0f013b6cd519671280186b8a39eb303cb080 Mon Sep 17 00:00:00 2001
From: Joanna Wang <jojwang@chromium.org>
Date: Fri, 24 Feb 2023 23:10:19 +0000
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git_cl.py b/git_cl.py
index b1ba09619..3c8e4acff 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -4762,7 +4762,7 @@ def CMDupload(parser, args):
     # 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.')