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

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Mon Apr 24 17:26:46 2017
New Revision: 301268

URL: http://llvm.org/viewvc/llvm-project?rev=301268&view=rev
Log:
[git-llvm] Remove CR from middle of svn propget output

Modified:
    llvm/trunk/utils/git-svn/git-llvm

Modified: llvm/trunk/utils/git-svn/git-llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/git-svn/git-llvm?rev=301268&r1=301267&r2=301268&view=diff
==============================================================================
--- llvm/trunk/utils/git-svn/git-llvm (original)
+++ llvm/trunk/utils/git-svn/git-llvm Mon Apr 24 17:26:46 2017
@@ -208,6 +208,8 @@ def fix_eol_style_native(rev, sr, svn_sr
                     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)