Merge branch 'maint-1.6.0' into maint-1.6.1
[git/mingw.git] / t / t3406-rebase-message.sh
blob539108094345e3e0ba4cf03fc20a5ca6486fa230
1 #!/bin/sh
3 test_description='messages from rebase operation'
5 . ./test-lib.sh
7 quick_one () {
8 echo "$1" >"file$1" &&
9 git add "file$1" &&
10 test_tick &&
11 git commit -m "$1"
14 test_expect_success setup '
15 quick_one O &&
16 git branch topic &&
17 quick_one X &&
18 quick_one A &&
19 quick_one B &&
20 quick_one Y &&
22 git checkout topic &&
23 quick_one A &&
24 quick_one B &&
25 quick_one Z
29 cat >expect <<\EOF
30 Already applied: 0001 A
31 Already applied: 0002 B
32 Committed: 0003 Z
33 EOF
35 test_expect_success 'rebase -m' '
37 git rebase -m master >report &&
38 sed -n -e "/^Already applied: /p" \
39 -e "/^Committed: /p" report >actual &&
40 test_cmp expect actual
44 test_done