diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-14 09:26:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-14 09:26:32 -0800 |
| commit | 73d8c358ec42823f793ff7b3f85d8d4612c7072e (patch) | |
| tree | 967a59a01160d03ec21f809ed7e188676e214ff4 /git-svn.perl | |
| parent | d9a3764af74ac215e06543c263ec21196d672b49 (diff) | |
| parent | 95450bbbaaacaf2d603a4fbded25d55243dfb291 (diff) | |
| download | git-ew/svn-crlf.tar.gz | |
Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlfew/svn-crlf
* 'svn-crlf' of git://bogomips.org/git-svn:
git-svn: convert CRLF to LF in commit message to SVN
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-svn.perl b/git-svn.perl index d2404184ba..aa242d4f4f 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1865,6 +1865,7 @@ sub get_commit_entry { } } $msgbuf =~ s/\s+$//s; + $msgbuf =~ s/\r\n/\n/sg; # SVN 1.6+ disallows CRLF if ($Git::SVN::_add_author_from && defined($author) && !$saw_from) { $msgbuf .= "\n\nFrom: $author"; |