diff options
| author | Eric Wong <e@80x24.org> | 2017-12-14 00:05:08 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2017-12-14 00:09:38 +0000 |
| commit | 95450bbbaaacaf2d603a4fbded25d55243dfb291 (patch) | |
| tree | 5cfb5660c8363eb15cf8b09837fd67f6419dd88f /t/t9169-git-svn-dcommit-crlf.sh | |
| parent | 95ec6b1b3393eb6e26da40c565520a8db9796e9f (diff) | |
| download | git-95450bbbaaacaf2d603a4fbded25d55243dfb291.tar.gz git-95450bbbaaacaf2d603a4fbded25d55243dfb291.tar.xz | |
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 't/t9169-git-svn-dcommit-crlf.sh')
| -rwxr-xr-x | t/t9169-git-svn-dcommit-crlf.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/t/t9169-git-svn-dcommit-crlf.sh b/t/t9169-git-svn-dcommit-crlf.sh new file mode 100755 index 000000000..54b1f61a2 --- /dev/null +++ b/t/t9169-git-svn-dcommit-crlf.sh @@ -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 |