mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
95450bbbaa
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>
27 lines
672 B
Bash
Executable file
27 lines
672 B
Bash
Executable file
#!/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
|