Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git] / t / t3408-rebase-multi-line.sh
blob6b84e6042a6fcc9cf850a53ad2a885597fb178fc
1 #!/bin/sh
3 test_description='rebasing a commit with multi-line first paragraph.'
5 . ./test-lib.sh
7 test_expect_success setup '
9 >file &&
10 git add file &&
11 test_tick &&
12 git commit -m initial &&
14 echo hello >file &&
15 test_tick &&
16 git commit -a -m "A sample commit log message that has a long
17 summary that spills over multiple lines.
19 But otherwise with a sane description." &&
21 git branch side &&
23 git reset --hard HEAD^ &&
24 >elif &&
25 git add elif &&
26 test_tick &&
27 git commit -m second
31 test_expect_success rebase '
33 git checkout side &&
34 git rebase master &&
35 git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
36 git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
37 test_cmp expect actual
41 test_done