From: Reid Kleckner <rnk@google.com>
Date: Mon, 24 Apr 2017 22:26:46 +0000 (+0000)
Subject: [git-llvm] Remove CR from middle of svn propget output
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=154994d2b5f4743c5c3e1e6f45fbcb9fda0ec3b2;p=llvm

[git-llvm] Remove CR from middle of svn propget output

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301268 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/git-svn/git-llvm b/utils/git-svn/git-llvm
index 8d427860a39..c2eaa5b6e64 100755
--- a/utils/git-svn/git-llvm
+++ b/utils/git-svn/git-llvm
@@ -208,6 +208,8 @@ def fix_eol_style_native(rev, sr, svn_sr_path):
                     ignore_errors=True).split('\n')
     crlf_files = []
     for eol_prop in eol_props:
+        # Remove spare CR.
+        eol_prop = eol_prop.strip('\r')
         if not eol_prop:
             continue
         prop_parts = eol_prop.rsplit(' - ', 1)