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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: upload.py

Issue 113586: Fix upload.py with git when diff.external is set. (Closed)
Patch Set: Created 11 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: upload.py
diff --git a/upload.py b/upload.py
index 1a87ad2ca10a10f4a24f273dee5c299e97799d39..3140908eb198ef409c4af165654c9f6a456b5d2e 100755
--- a/upload.py
+++ b/upload.py
@@ -1004,7 +1004,8 @@ class GitVCS(VersionControlSystem):
# the hashes of the base files, so we can upload them along with our diff.
if self.options.revision:
extra_args = [self.options.revision] + extra_args
- gitdiff = RunShell(["git", "diff", "--full-index"] + extra_args)
+ gitdiff = RunShell(["git", "diff", "--no-ext-diff", "--full-index"] +
+ extra_args)
svndiff = []
filecount = 0
filename = None
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698