From 1090fd5b69a9a23652d6a517295bfba01146462c Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Thu, 26 Jan 2017 09:37:54 +0100 Subject: [PATCH] Fix git cl upload --dependencies for Gerrit. BUG=640299 R=rmistry@chromium.org,agable@chromium.org Change-Id: Iac987758065c57a4a08ce98f838fc0c30a8c1a02 Reviewed-on: https://chromium-review.googlesource.com/432676 Commit-Queue: Andrii Shyshkalov Reviewed-by: Aaron Gable --- git_cl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_cl.py b/git_cl.py index e0ecde81d..a01125df4 100755 --- a/git_cl.py +++ b/git_cl.py @@ -3515,7 +3515,7 @@ def upload_branch_deps(cl, args): if root_branch is None: DieWithError('Can\'t find dependent branches from detached HEAD state. ' 'Get on a branch!') - if not cl.GetIssue() or not cl.GetPatchset(): + if not cl.GetIssue() or (not cl.IsGerrit() and not cl.GetPatchset()): DieWithError('Current branch does not have an uploaded CL. We cannot set ' 'patchset dependencies without an uploaded CL.')