third_party/upload.py - Issue 442893003: When getting content for a moved file w/ history, don't convert newlines in output of 'git show'

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/upload.py

Issue 442893003: When getting content for a moved file w/ history, don't convert newlines in output of 'git show' (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 6 years, 4 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

Index: third_party/upload.py

diff --git a/third_party/upload.py b/third_party/upload.py

index 74b97b6a0758f227f466b5e0080c44cef54a3988..fa4133c02c8252a3a0aec6f2eb0d80fd9acddc52 100755

--- a/third_party/upload.py

+++ b/third_party/upload.py

@@ -1659,7 +1659,8 @@ class GitVCS(VersionControlSystem):

if filename not in self.hashes:

# If a rename doesn't change the content, we never get a hash.

base_content = RunShell(

- ["git", "show", "HEAD:" + filename], silent_ok=True)

+ ["git", "show", "HEAD:" + filename], silent_ok=True,

+ universal_newlines=False)

elif not hash_before:

status = "A"

base_content = ""

« no previous file with comments | « no previous file | no next file » | no next file with comments »