]>
Commit | Line | Data |
---|---|---|
d7f6bae2 JH |
1 | #!/bin/sh |
2 | ||
a2309494 | 3 | test_description='rebase should handle arbitrary git message' |
d7f6bae2 | 4 | |
d1c02d93 | 5 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main |
334afbc7 JS |
6 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME |
7 | ||
d7f6bae2 | 8 | . ./test-lib.sh |
a6c612b5 | 9 | . "$TEST_DIRECTORY"/lib-rebase.sh |
d7f6bae2 JH |
10 | |
11 | cat >F <<\EOF | |
12 | This is an example of a commit log message | |
13 | that does not conform to git commit convention. | |
14 | ||
15 | It has two paragraphs, but its first paragraph is not friendly | |
16 | to oneline summary format. | |
17 | EOF | |
18 | ||
a2309494 MZ |
19 | cat >G <<\EOF |
20 | commit log message containing a diff | |
21 | EOF | |
22 | ||
23 | ||
d7f6bae2 JH |
24 | test_expect_success setup ' |
25 | ||
26 | >file1 && | |
27 | >file2 && | |
28 | git add file1 file2 && | |
29 | test_tick && | |
30 | git commit -m "Initial commit" && | |
99094a7a | 31 | git branch diff-in-message && |
a6c612b5 | 32 | git branch empty-message-merge && |
d7f6bae2 | 33 | |
a2309494 | 34 | git checkout -b multi-line-subject && |
d7f6bae2 JH |
35 | cat F >file2 && |
36 | git add file2 && | |
37 | test_tick && | |
38 | git commit -F F && | |
39 | ||
40 | git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 && | |
41 | ||
a2309494 MZ |
42 | git checkout diff-in-message && |
43 | echo "commit log message containing a diff" >G && | |
99094a7a | 44 | echo "" >>G && |
a2309494 MZ |
45 | cat G >file2 && |
46 | git add file2 && | |
47 | git diff --cached >>G && | |
48 | test_tick && | |
49 | git commit -F G && | |
50 | ||
51 | git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 && | |
52 | ||
a6c612b5 GS |
53 | git checkout empty-message-merge && |
54 | echo file3 >file3 && | |
55 | git add file3 && | |
56 | git commit --allow-empty-message -m "" && | |
57 | ||
d1c02d93 | 58 | git checkout main && |
d7f6bae2 JH |
59 | |
60 | echo One >file1 && | |
61 | test_tick && | |
62 | git add file1 && | |
63 | git commit -m "Second commit" | |
64 | ' | |
65 | ||
a2309494 | 66 | test_expect_success 'rebase commit with multi-line subject' ' |
d7f6bae2 | 67 | |
d1c02d93 | 68 | git rebase main multi-line-subject && |
d7f6bae2 JH |
69 | git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 && |
70 | ||
82ebb0b6 JK |
71 | test_cmp F0 F1 && |
72 | test_cmp F F0 | |
d7f6bae2 JH |
73 | ' |
74 | ||
a2309494 | 75 | test_expect_success 'rebase commit with diff in message' ' |
d1c02d93 | 76 | git rebase main diff-in-message && |
a2309494 MZ |
77 | git cat-file commit HEAD | sed -e "1,/^$/d" >G1 && |
78 | test_cmp G0 G1 && | |
79 | test_cmp G G0 | |
80 | ' | |
81 | ||
a6c612b5 | 82 | test_expect_success 'rebase -m commit with empty message' ' |
d1c02d93 | 83 | git rebase -m main empty-message-merge |
a6c612b5 GS |
84 | ' |
85 | ||
86 | test_expect_success 'rebase -i commit with empty message' ' | |
87 | git checkout diff-in-message && | |
88 | set_fake_editor && | |
a3ec9eaf | 89 | test_must_fail env FAKE_COMMIT_MESSAGE=" " FAKE_LINES="reword 1" \ |
b00bf1c9 | 90 | git rebase -i HEAD^ |
a6c612b5 GS |
91 | ' |
92 | ||
d7f6bae2 | 93 | test_done |