diff options
Diffstat (limited to 'llvm/utils/git-svn/git-llvm')
-rwxr-xr-x | llvm/utils/git-svn/git-llvm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/utils/git-svn/git-llvm b/llvm/utils/git-svn/git-llvm index 8d427860a39..c2eaa5b6e64 100755 --- a/llvm/utils/git-svn/git-llvm +++ b/llvm/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) |