diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-28 22:08:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-28 22:08:46 (GMT) |
| commit | 63dd544897c23227da1b6e57121d45adc5f91eb0 (patch) | |
| tree | 29003ea17477c6fcdd588f27d6dda27b2da99b8e /t | |
| parent | f427b94985f7f8cde46df20f644760adc0ca6735 (diff) | |
| parent | 73d8c358ec42823f793ff7b3f85d8d4612c7072e (diff) | |
| download | git-63dd544897c23227da1b6e57121d45adc5f91eb0.zip git-63dd544897c23227da1b6e57121d45adc5f91eb0.tar.gz git-63dd544897c23227da1b6e57121d45adc5f91eb0.tar.bz2 | |
Merge branch 'ew/svn-crlf'
"git svn" has been updated to strip CRs in the commit messages, as
recent versions of Subversion rejects them.
* ew/svn-crlf:
git-svn: convert CRLF to LF in commit message to SVN
Diffstat (limited to 't')
| -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 0000000..54b1f61 --- /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 |