commit 44e9bee34fcc7e8dedc2a988750c9d7cc7f73eba
author Joanna Wang <jojwang@chromium.org> Wed Jan 25 21:51:42 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 25 21:51:42 2023 +0000
tree 6656f1ebd20be60e8dc2e43ecaca54293b2a242c
parent 46f6005bb182d420347909a5a10318949a7da5e6

Allow --force to be used in cl patch with --reapply

Bug: b/265929888
Change-Id: I7ed00d70d18463b3394915ae4c74f853d05cb88d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4191996
Commit-Queue: 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 064b30b..7341b73 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -5127,8 +5127,8 @@
       RunGit(['pull'])
 
     target_issue_arg = ParseIssueNumberArgument(cl.GetIssue())
-    return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit, False,
-                                      False)
+    return cl.CMDPatchWithParsedIssue(target_issue_arg, options.nocommit,
+                                      options.force, False)
 
   if len(args) != 1 or not args[0]:
     parser.error('Must specify issue number or URL.')