1#!/bin/sh
2
3test_description='messages from rebase operation'
4
5. ./test-lib.sh
6
7quick_one () {
8 echo "$1" >"file$1" &&
9 git add "file$1" &&
10 test_tick &&
11 git commit -m "$1"
12}
13
14test_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 &&
21
22 git checkout topic &&
23 quick_one A &&
24 quick_one B &&
25 quick_one Z &&
26 git tag start
27
28'
29
30cat >expect <<\EOF
31Already applied: 0001 A
32Already applied: 0002 B
33Committed: 0003 Z
34EOF
35
36test_expect_success 'rebase -m' '
37
38 git rebase -m master >report &&
39 sed -n -e "/^Already applied: /p" \
40 -e "/^Committed: /p" report >actual &&
41 test_cmp expect actual
42
43'
44
45test_expect_success 'rebase --stat' '
46 git reset --hard start &&
47 git rebase --stat master >diffstat.txt &&
48 grep "^ fileX | *1 +$" diffstat.txt
49'
50
51test_expect_success 'rebase w/config rebase.stat' '
52 git reset --hard start &&
53 git config rebase.stat true &&
54 git rebase master >diffstat.txt &&
55 grep "^ fileX | *1 +$" diffstat.txt
56'
57
58test_expect_success 'rebase -n overrides config rebase.stat config' '
59 git reset --hard start &&
60 git config rebase.stat true &&
61 git rebase -n master >diffstat.txt &&
62 ! grep "^ fileX | *1 +$" diffstat.txt
63'
64
65test_expect_success 'rebase --onto outputs the invalid ref' '
66 test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
67 grep "invalid-ref" err
68'
69
70test_done