Merge branch 'nd/completion-negation'
[git/git.git] / t / t3400-rebase.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2005 Amos Waterland
4 #
5
6 test_description='git rebase assorted tests
7
8 This test runs git rebase and checks that the author information is not lost
9 among other things.
10 '
11 . ./test-lib.sh
12
13 GIT_AUTHOR_NAME=author@name
14 GIT_AUTHOR_EMAIL=bogus@email@address
15 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
16
17 test_expect_success 'prepare repository with topic branches' '
18 git config core.logAllRefUpdates true &&
19 echo First >A &&
20 git update-index --add A &&
21 git commit -m "Add A." &&
22 git checkout -b force-3way &&
23 echo Dummy >Y &&
24 git update-index --add Y &&
25 git commit -m "Add Y." &&
26 git checkout -b filemove &&
27 git reset --soft master &&
28 mkdir D &&
29 git mv A D/A &&
30 git commit -m "Move A." &&
31 git checkout -b my-topic-branch master &&
32 echo Second >B &&
33 git update-index --add B &&
34 git commit -m "Add B." &&
35 git checkout -f master &&
36 echo Third >>A &&
37 git update-index A &&
38 git commit -m "Modify A." &&
39 git checkout -b side my-topic-branch &&
40 echo Side >>C &&
41 git add C &&
42 git commit -m "Add C" &&
43 git checkout -f my-topic-branch &&
44 git tag topic
45 '
46
47 test_expect_success 'rebase on dirty worktree' '
48 echo dirty >>A &&
49 test_must_fail git rebase master
50 '
51
52 test_expect_success 'rebase on dirty cache' '
53 git add A &&
54 test_must_fail git rebase master
55 '
56
57 test_expect_success 'rebase against master' '
58 git reset --hard HEAD &&
59 git rebase master
60 '
61
62 test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
63 test_when_finished "git branch -D torebase" &&
64 git checkout -b torebase my-topic-branch^ &&
65 upstream=$(git rev-parse ":/Add B") &&
66 onto=$(git rev-parse ":/Add A") &&
67 git rebase --onto $onto $upstream &&
68 git reset --hard my-topic-branch^ &&
69 git rebase --onto ":/Add A" ":/Add B" &&
70 git checkout my-topic-branch
71 '
72
73 test_expect_success 'the rebase operation should not have destroyed author information' '
74 ! (git log | grep "Author:" | grep "<>")
75 '
76
77 test_expect_success 'the rebase operation should not have destroyed author information (2)' "
78 git log -1 |
79 grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
80 "
81
82 test_expect_success 'HEAD was detached during rebase' '
83 test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
84 '
85
86 test_expect_success 'rebase from ambiguous branch name' '
87 git checkout -b topic side &&
88 git rebase master
89 '
90
91 test_expect_success 'rebase off of the previous branch using "-"' '
92 git checkout master &&
93 git checkout HEAD^ &&
94 git rebase @{-1} >expect.messages &&
95 git merge-base master HEAD >expect.forkpoint &&
96
97 git checkout master &&
98 git checkout HEAD^ &&
99 git rebase - >actual.messages &&
100 git merge-base master HEAD >actual.forkpoint &&
101
102 test_cmp expect.forkpoint actual.forkpoint &&
103 # the next one is dubious---we may want to say "-",
104 # instead of @{-1}, in the message
105 test_i18ncmp expect.messages actual.messages
106 '
107
108 test_expect_success 'rebase a single mode change' '
109 git checkout master &&
110 git branch -D topic &&
111 echo 1 >X &&
112 git add X &&
113 test_tick &&
114 git commit -m prepare &&
115 git checkout -b modechange HEAD^ &&
116 echo 1 >X &&
117 git add X &&
118 test_chmod +x A &&
119 test_tick &&
120 git commit -m modechange &&
121 GIT_TRACE=1 git rebase master
122 '
123
124 test_expect_success 'rebase is not broken by diff.renames' '
125 test_config diff.renames copies &&
126 git checkout filemove &&
127 GIT_TRACE=1 git rebase force-3way
128 '
129
130 test_expect_success 'setup: recover' '
131 test_might_fail git rebase --abort &&
132 git reset --hard &&
133 git checkout modechange
134 '
135
136 test_expect_success 'Show verbose error when HEAD could not be detached' '
137 >B &&
138 test_must_fail git rebase topic 2>output.err >output.out &&
139 test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
140 test_i18ngrep B output.err
141 '
142 rm -f B
143
144 test_expect_success 'fail when upstream arg is missing and not on branch' '
145 git checkout topic &&
146 test_must_fail git rebase
147 '
148
149 test_expect_success 'fail when upstream arg is missing and not configured' '
150 git checkout -b no-config topic &&
151 test_must_fail git rebase
152 '
153
154 test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
155 git checkout -b default-base master &&
156 git checkout -b default topic &&
157 git config branch.default.remote . &&
158 git config branch.default.merge refs/heads/default-base &&
159 git rebase &&
160 git rev-parse --verify default-base >expect &&
161 git rev-parse default~1 >actual &&
162 test_cmp expect actual &&
163 git checkout default-base &&
164 git reset --hard HEAD^ &&
165 git checkout default &&
166 git rebase &&
167 git rev-parse --verify default-base >expect &&
168 git rev-parse default~1 >actual &&
169 test_cmp expect actual
170 '
171
172 test_expect_success 'cherry-picked commits and fork-point work together' '
173 git checkout default-base &&
174 echo Amended >A &&
175 git commit -a --no-edit --amend &&
176 test_commit B B &&
177 test_commit new_B B "New B" &&
178 test_commit C C &&
179 git checkout default &&
180 git reset --hard default-base@{4} &&
181 test_commit D D &&
182 git cherry-pick -2 default-base^ &&
183 test_commit final_B B "Final B" &&
184 git rebase &&
185 echo Amended >expect &&
186 test_cmp expect A &&
187 echo "Final B" >expect &&
188 test_cmp expect B &&
189 echo C >expect &&
190 test_cmp expect C &&
191 echo D >expect &&
192 test_cmp expect D
193 '
194
195 test_expect_success 'rebase -q is quiet' '
196 git checkout -b quiet topic &&
197 git rebase -q master >output.out 2>&1 &&
198 test_must_be_empty output.out
199 '
200
201 test_expect_success 'Rebase a commit that sprinkles CRs in' '
202 (
203 echo "One" &&
204 echo "TwoQ" &&
205 echo "Three" &&
206 echo "FQur" &&
207 echo "Five"
208 ) | q_to_cr >CR &&
209 git add CR &&
210 test_tick &&
211 git commit -a -m "A file with a line with CR" &&
212 git tag file-with-cr &&
213 git checkout HEAD^0 &&
214 git rebase --onto HEAD^^ HEAD^ &&
215 git diff --exit-code file-with-cr:CR HEAD:CR
216 '
217
218 test_expect_success 'rebase can copy notes' '
219 git config notes.rewrite.rebase true &&
220 git config notes.rewriteRef "refs/notes/*" &&
221 test_commit n1 &&
222 test_commit n2 &&
223 test_commit n3 &&
224 git notes add -m"a note" n3 &&
225 git rebase --onto n1 n2 &&
226 test "a note" = "$(git notes show HEAD)"
227 '
228
229 test_expect_success 'rebase -m can copy notes' '
230 git reset --hard n3 &&
231 git rebase -m --onto n1 n2 &&
232 test "a note" = "$(git notes show HEAD)"
233 '
234
235 test_expect_success 'rebase commit with an ancient timestamp' '
236 git reset --hard &&
237
238 >old.one && git add old.one && test_tick &&
239 git commit --date="@12345 +0400" -m "Old one" &&
240 >old.two && git add old.two && test_tick &&
241 git commit --date="@23456 +0500" -m "Old two" &&
242 >old.three && git add old.three && test_tick &&
243 git commit --date="@34567 +0600" -m "Old three" &&
244
245 git cat-file commit HEAD^^ >actual &&
246 grep "author .* 12345 +0400$" actual &&
247 git cat-file commit HEAD^ >actual &&
248 grep "author .* 23456 +0500$" actual &&
249 git cat-file commit HEAD >actual &&
250 grep "author .* 34567 +0600$" actual &&
251
252 git rebase --onto HEAD^^ HEAD^ &&
253
254 git cat-file commit HEAD >actual &&
255 grep "author .* 34567 +0600$" actual
256 '
257
258 test_expect_success 'rebase with "From " line in commit message' '
259 git checkout -b preserve-from master~1 &&
260 cat >From_.msg <<EOF &&
261 Somebody embedded an mbox in a commit message
262
263 This is from so-and-so:
264
265 From a@b Mon Sep 17 00:00:00 2001
266 From: John Doe <nobody@example.com>
267 Date: Sat, 11 Nov 2017 00:00:00 +0000
268 Subject: not this message
269
270 something
271 EOF
272 >From_ &&
273 git add From_ &&
274 git commit -F From_.msg &&
275 git rebase master &&
276 git log -1 --pretty=format:%B >out &&
277 test_cmp From_.msg out
278 '
279
280 test_expect_success 'rebase--am.sh and --show-current-patch' '
281 test_create_repo conflict-apply &&
282 (
283 cd conflict-apply &&
284 test_commit init &&
285 echo one >>init.t &&
286 git commit -a -m one &&
287 echo two >>init.t &&
288 git commit -a -m two &&
289 git tag two &&
290 test_must_fail git rebase --onto init HEAD^ &&
291 GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
292 grep "show.*$(git rev-parse two)" stderr
293 )
294 '
295
296 test_expect_success 'rebase--merge.sh and --show-current-patch' '
297 test_create_repo conflict-merge &&
298 (
299 cd conflict-merge &&
300 test_commit init &&
301 echo one >>init.t &&
302 git commit -a -m one &&
303 echo two >>init.t &&
304 git commit -a -m two &&
305 git tag two &&
306 test_must_fail git rebase --merge --onto init HEAD^ &&
307 git rebase --show-current-patch >actual.patch &&
308 GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
309 grep "show.*REBASE_HEAD" stderr &&
310 test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)"
311 )
312 '
313
314 test_done