commit df7263567add9621a359e42e406145790dd7426c
author Reid Kleckner <rnk@google.com> Mon Apr 24 22:26:46 2017 +0000
committer Reid Kleckner <rnk@google.com> Mon Apr 24 22:26:46 2017 +0000
tree 45607b3814f97a9c3df71bfeb36fad3b3ac31dcd
parent 63b26f0eeadc411ce877bfe340f5fac128397f5f

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

llvm-svn: 301268

llvm/utils/git-svn/git-llvm

diff --git a/llvm/utils/git-svn/git-llvm b/llvm/utils/git-svn/git-llvm
index 8d42786..c2eaa5b 100755
--- a/llvm/utils/git-svn/git-llvm
+++ b/llvm/utils/git-svn/git-llvm
@@ -208,6 +208,8 @@
                     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)