]>
Commit | Line | Data |
---|---|---|
7afa845e JS |
1 | #!/bin/sh |
2 | ||
3 | test_description='messages from rebase operation' | |
4 | ||
5 | . ./test-lib.sh | |
6 | ||
9e2248ef MZ |
7 | test_expect_success 'setup' ' |
8 | test_commit O fileO && | |
9 | test_commit X fileX && | |
10 | test_commit A fileA && | |
11 | test_commit B fileB && | |
12 | test_commit Y fileY && | |
7afa845e | 13 | |
9e2248ef MZ |
14 | git checkout -b topic O && |
15 | git cherry-pick A B && | |
16 | test_commit Z fileZ && | |
a9c3821c | 17 | git tag start |
7afa845e JS |
18 | ' |
19 | ||
7afa845e | 20 | test_expect_success 'rebase -m' ' |
7afa845e | 21 | git rebase -m master >report && |
68aa495b | 22 | >expect && |
7afa845e JS |
23 | sed -n -e "/^Already applied: /p" \ |
24 | -e "/^Committed: /p" report >actual && | |
82ebb0b6 | 25 | test_cmp expect actual |
7afa845e JS |
26 | ' |
27 | ||
c9581cc8 MZ |
28 | test_expect_success 'rebase against master twice' ' |
29 | git rebase master >out && | |
30 | test_i18ngrep "Current branch topic is up to date" out | |
31 | ' | |
32 | ||
33 | test_expect_success 'rebase against master twice with --force' ' | |
34 | git rebase --force-rebase master >out && | |
35 | test_i18ngrep "Current branch topic is up to date, rebase forced" out | |
36 | ' | |
37 | ||
38 | test_expect_success 'rebase against master twice from another branch' ' | |
39 | git checkout topic^ && | |
40 | git rebase master topic >out && | |
41 | test_i18ngrep "Current branch topic is up to date" out | |
42 | ' | |
43 | ||
44 | test_expect_success 'rebase fast-forward to master' ' | |
45 | git checkout topic^ && | |
46 | git rebase topic >out && | |
47 | test_i18ngrep "Fast-forwarded HEAD to topic" out | |
48 | ' | |
49 | ||
a9c3821c | 50 | test_expect_success 'rebase --stat' ' |
a48fcd83 | 51 | git reset --hard start && |
a9c3821c TAV |
52 | git rebase --stat master >diffstat.txt && |
53 | grep "^ fileX | *1 +$" diffstat.txt | |
54 | ' | |
55 | ||
56 | test_expect_success 'rebase w/config rebase.stat' ' | |
a48fcd83 | 57 | git reset --hard start && |
a9c3821c TAV |
58 | git config rebase.stat true && |
59 | git rebase master >diffstat.txt && | |
60 | grep "^ fileX | *1 +$" diffstat.txt | |
61 | ' | |
62 | ||
63 | test_expect_success 'rebase -n overrides config rebase.stat config' ' | |
a48fcd83 | 64 | git reset --hard start && |
a9c3821c TAV |
65 | git config rebase.stat true && |
66 | git rebase -n master >diffstat.txt && | |
67 | ! grep "^ fileX | *1 +$" diffstat.txt | |
68 | ' | |
69 | ||
c7108bf9 JX |
70 | # Output to stderr: |
71 | # | |
72 | # "Does not point to a valid commit: invalid-ref" | |
73 | # | |
74 | # NEEDSWORK: This "grep" is fine in real non-C locales, but | |
6cdccfce | 75 | # GIT_TEST_GETTEXT_POISON poisons the refname along with the enclosing |
c7108bf9 | 76 | # error message. |
9180feaf EFL |
77 | test_expect_success 'rebase --onto outputs the invalid ref' ' |
78 | test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err && | |
c7108bf9 | 79 | test_i18ngrep "invalid-ref" err |
9180feaf EFL |
80 | ' |
81 | ||
04519d72 JS |
82 | test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' ' |
83 | test_must_fail git rebase -Cnot-a-number HEAD 2>err && | |
84 | test_i18ngrep "numerical value" err && | |
85 | test_must_fail git rebase --whitespace=bad HEAD 2>err && | |
86 | test_i18ngrep "Invalid whitespace option" err | |
87 | ' | |
88 | ||
13a5a9f0 JS |
89 | test_expect_success 'GIT_REFLOG_ACTION' ' |
90 | git checkout start && | |
91 | test_commit reflog-onto && | |
92 | git checkout -b reflog-topic start && | |
93 | test_commit reflog-to-rebase && | |
94 | ||
95 | git rebase reflog-onto && | |
96 | git log -g --format=%gs -3 >actual && | |
97 | cat >expect <<-\EOF && | |
98 | rebase finished: returning to refs/heads/reflog-topic | |
99 | rebase: reflog-to-rebase | |
100 | rebase: checkout reflog-onto | |
101 | EOF | |
102 | test_cmp expect actual && | |
103 | ||
104 | git checkout -b reflog-prefix reflog-to-rebase && | |
105 | GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto && | |
106 | git log -g --format=%gs -3 >actual && | |
107 | cat >expect <<-\EOF && | |
108 | rebase finished: returning to refs/heads/reflog-prefix | |
109 | change-the-reflog: reflog-to-rebase | |
110 | change-the-reflog: checkout reflog-onto | |
111 | EOF | |
112 | test_cmp expect actual | |
113 | ' | |
114 | ||
8797f0f0 JS |
115 | test_expect_success 'rebase -i onto unrelated history' ' |
116 | git init unrelated && | |
117 | test_commit -C unrelated 1 && | |
118 | git -C unrelated remote add -f origin "$PWD" && | |
119 | git -C unrelated branch --set-upstream-to=origin/master && | |
120 | git -C unrelated -c core.editor=true rebase -i -v --stat >actual && | |
121 | test_i18ngrep "Changes to " actual && | |
122 | test_i18ngrep "5 files changed" actual | |
123 | ' | |
124 | ||
7afa845e | 125 | test_done |