From e1623bbab3b9a52d019da90132e73607310b6741 Mon Sep 17 00:00:00 2001 From: "jrobbins@chromium.org" Date: Tue, 5 Aug 2014 22:19:09 +0000 Subject: [PATCH] When getting content for a moved file w/ history, don't convert newlines in output of 'git show' BUG=339068 Review URL: https://codereview.chromium.org/442893003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@287615 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/upload.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/third_party/upload.py b/third_party/upload.py index 74b97b6a0..fa4133c02 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 = ""