Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Unified Diff: gclient_scm.py

Issue 563873002: Revert "Make check for dirty index work." (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/gclient_scm_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gclient_scm.py
diff --git a/gclient_scm.py b/gclient_scm.py
index 7bf559c5083c71f7223d7f3e5204272afa41a789..dff72d09212b96ac2cec421e219f3778e9b5228e 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -612,10 +612,9 @@ class GitWrapper(SCMWrapper):
return
else:
self.Print('Input not recognized')
- elif re.match("error: Your local changes to (')?.*(')? would be "
- "overwritten by merge(. Aborting)?[:.]\n(.*\n)?Please, "
- "commit your changes or stash them before you can "
- "merge.\n",
+ elif re.match("error: Your local changes to '.*' would be "
+ "overwritten by merge. Aborting.\nPlease, commit your "
+ "changes or stash them before you can merge.\n",
e.stderr):
if not printed_path:
self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
@@ -1022,7 +1021,7 @@ class GitWrapper(SCMWrapper):
% (self.relpath, rev_str))
try:
scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
- '--ignore-submodules', '--exit-code', 'HEAD', '--'],
+ '--ignore-submodules', 'HEAD', '--'],
cwd=self.checkout_path)
except subprocess2.CalledProcessError:
raise gclient_utils.Error('\n____ %s%s\n'
« no previous file with comments | « no previous file | tests/gclient_scm_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698