diff options
| author | Eric Wong <e@80x24.org> | 2017-12-14 00:05:08 (GMT) |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2017-12-14 00:09:38 (GMT) |
| commit | 95450bbbaaacaf2d603a4fbded25d55243dfb291 (patch) | |
| tree | 5cfb5660c8363eb15cf8b09837fd67f6419dd88f /git-svn.perl | |
| parent | 95ec6b1b3393eb6e26da40c565520a8db9796e9f (diff) | |
| download | git-95450bbbaaacaf2d603a4fbded25d55243dfb291.zip git-95450bbbaaacaf2d603a4fbded25d55243dfb291.tar.gz git-95450bbbaaacaf2d603a4fbded25d55243dfb291.tar.bz2 | |
git-svn: convert CRLF to LF in commit message to SVN
Subversion since 1.6 does not accept CR characters in the commit
message, so filter it out on our end before 'git svn dcommit' sets
the svn:log property.
Reported-by: Brian Bennett <Brian.Bennett@Transamerica.com>
Signed-off-by: Eric Wong <e@80x24.org>
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 d240418..aa242d4 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"; |