mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 14:27:54 +01:00
Code Activity

Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf

Browse source 
* 'svn-crlf' of git://bogomips.org/git-svn:
  git-svn: convert CRLF to LF in commit message to SVN
This commit is contained in:
Junio C Hamano 2017-12-14 09:26:32 -08:00
commit 73d8c358ec
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
git-svn.perl
View file

@ -1865,6 +1865,7 @@ sub get_commit_entry {
} }
} }
$msgbuf =~ s/\s+$//s; $msgbuf =~ s/\s+$//s;
$msgbuf =~ s/\r\n/\n/sg; # SVN 1.6+ disallows CRLF
if ($Git::SVN::_add_author_from && defined($author) if ($Git::SVN::_add_author_from && defined($author)
&& !$saw_from) { && !$saw_from) {
$msgbuf .= "\n\nFrom: $author"; $msgbuf .= "\n\nFrom: $author";

27
t/t9169-git-svn-dcommit-crlf.sh Executable file
View file

@ -0,0 +1,27 @@
#!/bin/sh
test_description='git svn dcommit CRLF'
. ./lib-git-svn.sh
test_expect_success 'setup commit repository' '
svn_cmd mkdir -m "$test_description" "$svnrepo/dir" &&
git svn clone "$svnrepo" work &&
(
cd work &&
echo foo >>foo &&
git update-index --add foo &&
printf "a\\r\\n\\r\\nb\\r\\nc\\r\\n" >cmt &&
p=$(git rev-parse HEAD) &&
t=$(git write-tree) &&
cmt=$(git commit-tree -p $p $t <cmt) &&
git update-ref refs/heads/master $cmt &&
git cat-file commit HEAD | tail -n4 >out &&
test_cmp cmt out &&
git svn dcommit &&
printf "a\\n\\nb\\nc\\n" >exp &&
git cat-file commit HEAD | sed -ne 6,9p >out &&
test_cmp exp out
)
'
test_done