mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / t / t3405-rebase-malformed.sh
blobe4e2e649ed03394f623eb0d135815c3d570a3186
1 #!/bin/sh
3 test_description='rebase should not insist on git message convention'
5 . ./test-lib.sh
7 cat >F <<\EOF
8 This is an example of a commit log message
9 that does not conform to git commit convention.
11 It has two paragraphs, but its first paragraph is not friendly
12 to oneline summary format.
13 EOF
15 test_expect_success setup '
17 >file1 &&
18 >file2 &&
19 git add file1 file2 &&
20 test_tick &&
21 git commit -m "Initial commit" &&
23 git checkout -b side &&
24 cat F >file2 &&
25 git add file2 &&
26 test_tick &&
27 git commit -F F &&
29 git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
31 git checkout master &&
33 echo One >file1 &&
34 test_tick &&
35 git add file1 &&
36 git commit -m "Second commit"
39 test_expect_success rebase '
41 git rebase master side &&
42 git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
44 diff -u F0 F1 &&
45 diff -u F F0
48 test_done