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 | 154994d2b5f4743c5c3e1e6f45fbcb9fda0ec3b2 (patch) | |
| tree | 5d702776aaadc6568c889e0f9264182e4c538d14 /utils/git-svn | |
| parent | d2cbf1a6a4f0f994f527077a40676240dc41e50b (diff) | |
[git-llvm] Remove CR from middle of svn propget output
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@301268 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/git-svn')
| -rwxr-xr-x | utils/git-svn/git-llvm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/git-svn/git-llvm b/utils/git-svn/git-llvm index 8d427860a39..c2eaa5b6e64 100755 --- a/utils/git-svn/git-llvm +++ b/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) |