From bf2a34198e6d4ec0c6403da5cf632b37a2ac8478 Mon Sep 17 00:00:00 2001 From: techtonik Date: Wed, 20 Jul 2016 23:36:42 -0700 Subject: [PATCH] Stashing is also an option when copy is dirty for upload BUG= Review-Url: https://codereview.chromium.org/2019223002 --- git_common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git_common.py b/git_common.py index 9ccbbc35a..289665e24 100644 --- 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