commit fcf9fc4c36d6a3b244fd95fbceaa7b9030e67362
author Josip Sokcevic <sokcevic@google.com> Tue Sep 27 21:59:01 2022 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 27 21:59:01 2022 +0000
tree f8c6bb3b656a2398acffd0c81fe6afeadec42e0d
parent 9ef048cd501f4e52fcb8f29f93c063ed5955175e

Remove freeze as suggestion on git cl upload

Freeze command creates a commit, which then could be uploaded with git
cl upload.

R=gavinmak@google.com

Bug: 630822
Change-Id: I2fdc7bd8579f17680454b046ae80a473c6d420aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3923515
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Auto-Submit: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>

git_common.py

diff --git a/git_common.py b/git_common.py
index 0a984ae..3fea740 100644
--- a/git_common.py
+++ b/git_common.py
@@ -847,8 +847,8 @@
 
   dirty = get_dirty_files()
   if dirty:
-    w('Cannot %s with a dirty tree. Commit, freeze or stash your changes first.'
-      % cmd)
+    w('Cannot %s with a dirty tree. Commit%s or stash your changes first.' %
+      (cmd, '' if cmd == 'upload' else ', freeze'))
     w('Uncommitted files: (git diff-index --name-status HEAD)')
     w(dirty[:4096])
     if len(dirty) > 4096: # pragma: no cover