Merge branch 'nd/ita-wt-renames-in-status'
[gitweb.git] / git-svn.perl
index d2404184ba2edc1ac330898ca610ad5e5df8d6c9..aa242d4f4f4363736730ccfcb4c2694d5be9a670 100755 (executable)
@@ -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";