Stashing is also an option when copy is dirty for upload

BUG= Review-Url: https://codereview.chromium.org/2019223002
9 years ago · bf2a34198e
parent f268b50a81
commit bf2a34198e
1 changed files with 2 additions and 1 deletions
--- a/git_common.py
+++ b/git_common.py
@ -750,7 +750,8 @@ def get_dirty_files():
 def is_dirty_git_tree(cmd):
  dirty = get_dirty_files()
  if dirty:
-    print 'Cannot %s with a dirty tree. You must commit locally first.' % cmd
+    print 'Cannot %s with a dirty tree. '\
+          'Commit, freeze or stash your changes first.' % cmd
    print 'Uncommitted files: (git diff-index --name-status HEAD)'
    print dirty[:4096]
    if len(dirty) > 4096: # pragma: no cover