]> granicus.if.org Git - llvm/commitdiff
[git-llvm] Remove CR from middle of svn propget output
authorReid Kleckner <rnk@google.com>
Mon, 24 Apr 2017 22:26:46 +0000 (22:26 +0000)
committerReid Kleckner <rnk@google.com>
Mon, 24 Apr 2017 22:26:46 +0000 (22:26 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301268 91177308-0d34-0410-b5e6-96231b3b80d8

utils/git-svn/git-llvm

index 8d427860a3969403d8a3aed85b97a3b18d9fa65d..c2eaa5b6e64041f3618f4ecaecf1170cb6d3ccd7 100755 (executable)
@@ -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)