]> git.ipfire.org Git - thirdparty/git.git/blob - t/t3405-rebase-malformed.sh
Merge branch 'maint'
[thirdparty/git.git] / t / t3405-rebase-malformed.sh
1 #!/bin/sh
2
3 test_description='rebase should not insist on git message convention'
4
5 . ./test-lib.sh
6
7 cat >F <<\EOF
8 This is an example of a commit log message
9 that does not conform to git commit convention.
10
11 It has two paragraphs, but its first paragraph is not friendly
12 to oneline summary format.
13 EOF
14
15 test_expect_success setup '
16
17 >file1 &&
18 >file2 &&
19 git add file1 file2 &&
20 test_tick &&
21 git commit -m "Initial commit" &&
22
23 git checkout -b side &&
24 cat F >file2 &&
25 git add file2 &&
26 test_tick &&
27 git commit -F F &&
28
29 git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
30
31 git checkout master &&
32
33 echo One >file1 &&
34 test_tick &&
35 git add file1 &&
36 git commit -m "Second commit"
37 '
38
39 test_expect_success rebase '
40
41 git rebase master side &&
42 git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
43
44 test_cmp F0 F1 &&
45 test_cmp F F0
46 '
47
48 test_done