diff options
| author | Reid Kleckner <rnk@google.com> | 2017-04-24 22:26:46 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2017-04-24 22:26:46 +0000 |
| commit | df7263567add9621a359e42e406145790dd7426c (patch) | |
| tree | 45607b3814f97a9c3df71bfeb36fad3b3ac31dcd /llvm/utils/git-svn | |
| parent | 63b26f0eeadc411ce877bfe340f5fac128397f5f (diff) | |
| download | bcm5719-llvm-df7263567add9621a359e42e406145790dd7426c.tar.gz bcm5719-llvm-df7263567add9621a359e42e406145790dd7426c.zip | |
[git-llvm] Remove CR from middle of svn propget output
llvm-svn: 301268
Diffstat (limited to 'llvm/utils/git-svn')
| -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) |
