merge-recursive: improve auto-merging messages with path collisions
[git] / t / t9169-git-svn-dcommit-crlf.sh
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