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>
Eric Wong committed
Dec 14, 2017 at 00:05 UTC
95450bbbaaacaf2d603a4fbded25d55243dfb291
2 files changed
+28
git-svn.perl
+1
@@ -1865,6 +1865,7 @@ sub get_commit_entry {
1865
}
1866
}
1867
$msgbuf =~ s/\s+$//s;
1868
+ $msgbuf =~ s/\r\n/\n/sg; # SVN 1.6+ disallows CRLF
1869
if ($Git::SVN::_add_author_from && defined($author)
1870
&& !$saw_from) {
1871
$msgbuf .= "\n\nFrom: $author";
t/t9169-git-svn-dcommit-crlf.sh
new
+27
@@ -0,0 +1,27 @@
1
+#!/bin/sh
2
+
3
+test_description='git svn dcommit CRLF'
4
+. ./lib-git-svn.sh
5
+
6
+test_expect_success 'setup commit repository' '
7
+ svn_cmd mkdir -m "$test_description" "$svnrepo/dir" &&
8
+ git svn clone "$svnrepo" work &&
9
+ (
10
+ cd work &&
11
+ echo foo >>foo &&
12
+ git update-index --add foo &&
13
+ printf "a\\r\\n\\r\\nb\\r\\nc\\r\\n" >cmt &&
14
+ p=$(git rev-parse HEAD) &&
15
+ t=$(git write-tree) &&
16
+ cmt=$(git commit-tree -p $p $t <cmt) &&
17
+ git update-ref refs/heads/master $cmt &&
18
+ git cat-file commit HEAD | tail -n4 >out &&
19
+ test_cmp cmt out &&
20
+ git svn dcommit &&
21
+ printf "a\\n\\nb\\nc\\n" >exp &&
22
+ git cat-file commit HEAD | sed -ne 6,9p >out &&
23
+ test_cmp exp out
24
+ )
25
+'
26
+
27
+test_done