]>
Commit | Line | Data |
---|---|---|
294c695d AW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Amos Waterland | |
4 | # | |
5 | ||
c2ca1d79 | 6 | test_description='git rebase assorted tests |
294c695d | 7 | |
c2ca1d79 JH |
8 | This test runs git rebase and checks that the author information is not lost |
9 | among other things. | |
294c695d AW |
10 | ' |
11 | . ./test-lib.sh | |
12 | ||
43c23251 JS |
13 | GIT_AUTHOR_NAME=author@name |
14 | GIT_AUTHOR_EMAIL=bogus@email@address | |
15 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL | |
294c695d | 16 | |
e877a4c1 JN |
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." && | |
840b3ca7 JH |
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 && | |
e877a4c1 JN |
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" && | |
e877a4c1 JN |
43 | git checkout -f my-topic-branch && |
44 | git tag topic | |
1308c17b JS |
45 | ' |
46 | ||
7a7eb517 | 47 | test_expect_success 'rebase on dirty worktree' ' |
e877a4c1 JN |
48 | echo dirty >>A && |
49 | test_must_fail git rebase master | |
50 | ' | |
7a7eb517 NTND |
51 | |
52 | test_expect_success 'rebase on dirty cache' ' | |
e877a4c1 JN |
53 | git add A && |
54 | test_must_fail git rebase master | |
55 | ' | |
7a7eb517 | 56 | |
1308c17b | 57 | test_expect_success 'rebase against master' ' |
e877a4c1 JN |
58 | git reset --hard HEAD && |
59 | git rebase master | |
60 | ' | |
294c695d | 61 | |
cbd29ead | 62 | test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' ' |
c2d96293 JS |
63 | git checkout -b orig-head topic && |
64 | pre="$(git rev-parse --verify HEAD)" && | |
65 | git rebase master && | |
66 | test_cmp_rev "$pre" ORIG_HEAD && | |
2c9e125b | 67 | test_cmp_rev ! "$pre" HEAD |
c2d96293 JS |
68 | ' |
69 | ||
2e6e276d | 70 | test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' ' |
6567dc05 RR |
71 | test_when_finished "git branch -D torebase" && |
72 | git checkout -b torebase my-topic-branch^ && | |
73 | upstream=$(git rev-parse ":/Add B") && | |
74 | onto=$(git rev-parse ":/Add A") && | |
75 | git rebase --onto $onto $upstream && | |
76 | git reset --hard my-topic-branch^ && | |
77 | git rebase --onto ":/Add A" ":/Add B" && | |
78 | git checkout my-topic-branch | |
79 | ' | |
80 | ||
e877a4c1 JN |
81 | test_expect_success 'the rebase operation should not have destroyed author information' ' |
82 | ! (git log | grep "Author:" | grep "<>") | |
83 | ' | |
294c695d | 84 | |
e877a4c1 JN |
85 | test_expect_success 'the rebase operation should not have destroyed author information (2)' " |
86 | git log -1 | | |
87 | grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>' | |
88 | " | |
43c23251 | 89 | |
2559bff3 | 90 | test_expect_success 'HEAD was detached during rebase' ' |
e877a4c1 | 91 | test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1}) |
2559bff3 JS |
92 | ' |
93 | ||
ea709800 PH |
94 | test_expect_success 'rebase from ambiguous branch name' ' |
95 | git checkout -b topic side && | |
96 | git rebase master | |
97 | ' | |
98 | ||
4f407407 BG |
99 | test_expect_success 'rebase off of the previous branch using "-"' ' |
100 | git checkout master && | |
101 | git checkout HEAD^ && | |
102 | git rebase @{-1} >expect.messages && | |
103 | git merge-base master HEAD >expect.forkpoint && | |
104 | ||
105 | git checkout master && | |
106 | git checkout HEAD^ && | |
107 | git rebase - >actual.messages && | |
108 | git merge-base master HEAD >actual.forkpoint && | |
109 | ||
110 | test_cmp expect.forkpoint actual.forkpoint && | |
111 | # the next one is dubious---we may want to say "-", | |
112 | # instead of @{-1}, in the message | |
113 | test_i18ncmp expect.messages actual.messages | |
114 | ' | |
115 | ||
ece7b749 | 116 | test_expect_success 'rebase a single mode change' ' |
e877a4c1 | 117 | git checkout master && |
3f213981 | 118 | git branch -D topic && |
e877a4c1 JN |
119 | echo 1 >X && |
120 | git add X && | |
121 | test_tick && | |
122 | git commit -m prepare && | |
123 | git checkout -b modechange HEAD^ && | |
124 | echo 1 >X && | |
125 | git add X && | |
126 | test_chmod +x A && | |
127 | test_tick && | |
128 | git commit -m modechange && | |
129 | GIT_TRACE=1 git rebase master | |
ece7b749 JS |
130 | ' |
131 | ||
840b3ca7 | 132 | test_expect_success 'rebase is not broken by diff.renames' ' |
55adef06 | 133 | test_config diff.renames copies && |
840b3ca7 JH |
134 | git checkout filemove && |
135 | GIT_TRACE=1 git rebase force-3way | |
136 | ' | |
137 | ||
138 | test_expect_success 'setup: recover' ' | |
139 | test_might_fail git rebase --abort && | |
140 | git reset --hard && | |
141 | git checkout modechange | |
142 | ' | |
143 | ||
3ec7371f | 144 | test_expect_success 'Show verbose error when HEAD could not be detached' ' |
e877a4c1 | 145 | >B && |
df126ca1 | 146 | test_when_finished "rm -f B" && |
e877a4c1 | 147 | test_must_fail git rebase topic 2>output.err >output.out && |
e5c1272c VA |
148 | test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err && |
149 | test_i18ngrep B output.err | |
3ec7371f | 150 | ' |
bffd750a | 151 | |
15a147e6 MZ |
152 | test_expect_success 'fail when upstream arg is missing and not on branch' ' |
153 | git checkout topic && | |
3c02396a | 154 | test_must_fail git rebase |
15a147e6 MZ |
155 | ' |
156 | ||
157 | test_expect_success 'fail when upstream arg is missing and not configured' ' | |
158 | git checkout -b no-config topic && | |
3c02396a | 159 | test_must_fail git rebase |
15a147e6 MZ |
160 | ' |
161 | ||
cae0bc09 | 162 | test_expect_success 'rebase works with format.useAutoBase' ' |
0c47e061 DL |
163 | test_config format.useAutoBase true && |
164 | git checkout topic && | |
165 | git rebase master | |
166 | ' | |
167 | ||
ad8261d2 | 168 | test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' |
bb3f4583 | 169 | git checkout -b default-base master && |
15a147e6 | 170 | git checkout -b default topic && |
02380389 | 171 | git config branch.default.remote . && |
bb3f4583 | 172 | git config branch.default.merge refs/heads/default-base && |
15a147e6 | 173 | git rebase && |
bb3f4583 JK |
174 | git rev-parse --verify default-base >expect && |
175 | git rev-parse default~1 >actual && | |
176 | test_cmp expect actual && | |
177 | git checkout default-base && | |
178 | git reset --hard HEAD^ && | |
179 | git checkout default && | |
180 | git rebase && | |
181 | git rev-parse --verify default-base >expect && | |
ad8261d2 JK |
182 | git rev-parse default~1 >actual && |
183 | test_cmp expect actual | |
bffd750a | 184 | ' |
3ec7371f | 185 | |
1e0dacdb JK |
186 | test_expect_success 'cherry-picked commits and fork-point work together' ' |
187 | git checkout default-base && | |
188 | echo Amended >A && | |
189 | git commit -a --no-edit --amend && | |
190 | test_commit B B && | |
191 | test_commit new_B B "New B" && | |
192 | test_commit C C && | |
193 | git checkout default && | |
194 | git reset --hard default-base@{4} && | |
195 | test_commit D D && | |
196 | git cherry-pick -2 default-base^ && | |
197 | test_commit final_B B "Final B" && | |
198 | git rebase && | |
199 | echo Amended >expect && | |
dcbaa0b3 | 200 | test_cmp expect A && |
1e0dacdb | 201 | echo "Final B" >expect && |
dcbaa0b3 | 202 | test_cmp expect B && |
1e0dacdb | 203 | echo C >expect && |
dcbaa0b3 | 204 | test_cmp expect C && |
1e0dacdb | 205 | echo D >expect && |
dcbaa0b3 | 206 | test_cmp expect D |
1e0dacdb JK |
207 | ' |
208 | ||
0e987a12 | 209 | test_expect_success 'rebase -q is quiet' ' |
e877a4c1 JN |
210 | git checkout -b quiet topic && |
211 | git rebase -q master >output.out 2>&1 && | |
ca8d148d | 212 | test_must_be_empty output.out |
0e987a12 SB |
213 | ' |
214 | ||
c2ca1d79 JH |
215 | test_expect_success 'Rebase a commit that sprinkles CRs in' ' |
216 | ( | |
3ea67379 ES |
217 | echo "One" && |
218 | echo "TwoQ" && | |
219 | echo "Three" && | |
220 | echo "FQur" && | |
c2ca1d79 JH |
221 | echo "Five" |
222 | ) | q_to_cr >CR && | |
223 | git add CR && | |
224 | test_tick && | |
225 | git commit -a -m "A file with a line with CR" && | |
226 | git tag file-with-cr && | |
227 | git checkout HEAD^0 && | |
228 | git rebase --onto HEAD^^ HEAD^ && | |
229 | git diff --exit-code file-with-cr:CR HEAD:CR | |
230 | ' | |
231 | ||
eb2151bb TR |
232 | test_expect_success 'rebase can copy notes' ' |
233 | git config notes.rewrite.rebase true && | |
234 | git config notes.rewriteRef "refs/notes/*" && | |
235 | test_commit n1 && | |
236 | test_commit n2 && | |
237 | test_commit n3 && | |
238 | git notes add -m"a note" n3 && | |
239 | git rebase --onto n1 n2 && | |
240 | test "a note" = "$(git notes show HEAD)" | |
241 | ' | |
242 | ||
243 | test_expect_success 'rebase -m can copy notes' ' | |
244 | git reset --hard n3 && | |
245 | git rebase -m --onto n1 n2 && | |
246 | test "a note" = "$(git notes show HEAD)" | |
247 | ' | |
248 | ||
2c733fb2 JH |
249 | test_expect_success 'rebase commit with an ancient timestamp' ' |
250 | git reset --hard && | |
251 | ||
252 | >old.one && git add old.one && test_tick && | |
253 | git commit --date="@12345 +0400" -m "Old one" && | |
254 | >old.two && git add old.two && test_tick && | |
255 | git commit --date="@23456 +0500" -m "Old two" && | |
256 | >old.three && git add old.three && test_tick && | |
257 | git commit --date="@34567 +0600" -m "Old three" && | |
258 | ||
259 | git cat-file commit HEAD^^ >actual && | |
260 | grep "author .* 12345 +0400$" actual && | |
261 | git cat-file commit HEAD^ >actual && | |
262 | grep "author .* 23456 +0500$" actual && | |
263 | git cat-file commit HEAD >actual && | |
264 | grep "author .* 34567 +0600$" actual && | |
265 | ||
266 | git rebase --onto HEAD^^ HEAD^ && | |
267 | ||
268 | git cat-file commit HEAD >actual && | |
269 | grep "author .* 34567 +0600$" actual | |
270 | ' | |
271 | ||
ae3b2b04 EW |
272 | test_expect_success 'rebase with "From " line in commit message' ' |
273 | git checkout -b preserve-from master~1 && | |
274 | cat >From_.msg <<EOF && | |
275 | Somebody embedded an mbox in a commit message | |
276 | ||
277 | This is from so-and-so: | |
278 | ||
279 | From a@b Mon Sep 17 00:00:00 2001 | |
280 | From: John Doe <nobody@example.com> | |
281 | Date: Sat, 11 Nov 2017 00:00:00 +0000 | |
282 | Subject: not this message | |
283 | ||
284 | something | |
285 | EOF | |
286 | >From_ && | |
287 | git add From_ && | |
288 | git commit -F From_.msg && | |
289 | git rebase master && | |
290 | git log -1 --pretty=format:%B >out && | |
291 | test_cmp From_.msg out | |
292 | ' | |
293 | ||
b2b9a231 | 294 | test_expect_success 'rebase --am and --show-current-patch' ' |
66335298 NTND |
295 | test_create_repo conflict-apply && |
296 | ( | |
297 | cd conflict-apply && | |
298 | test_commit init && | |
299 | echo one >>init.t && | |
300 | git commit -a -m one && | |
301 | echo two >>init.t && | |
302 | git commit -a -m two && | |
303 | git tag two && | |
c0efb4c1 | 304 | test_must_fail git rebase -f --onto init HEAD^ && |
66335298 NTND |
305 | GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr && |
306 | grep "show.*$(git rev-parse two)" stderr | |
307 | ) | |
308 | ' | |
309 | ||
2c65d90f | 310 | test_expect_success 'rebase --am and .gitattributes' ' |
311 | test_create_repo attributes && | |
312 | ( | |
313 | cd attributes && | |
314 | test_commit init && | |
315 | git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" && | |
316 | git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" && | |
317 | ||
318 | test_commit second && | |
319 | git checkout -b test HEAD^ && | |
320 | ||
321 | echo "*.txt filter=test" >.gitattributes && | |
322 | git add .gitattributes && | |
323 | test_commit third && | |
324 | ||
325 | echo "This text is smudged." >a.txt && | |
326 | git add a.txt && | |
327 | test_commit fourth && | |
328 | ||
329 | git checkout -b removal HEAD^ && | |
330 | git rm .gitattributes && | |
331 | git add -u && | |
332 | test_commit fifth && | |
333 | git cherry-pick test && | |
334 | ||
335 | git checkout test && | |
336 | git rebase master && | |
337 | grep "smudged" a.txt && | |
338 | ||
339 | git checkout removal && | |
340 | git reset --hard && | |
341 | git rebase master && | |
342 | grep "clean" a.txt | |
343 | ) | |
344 | ' | |
345 | ||
66335298 NTND |
346 | test_expect_success 'rebase--merge.sh and --show-current-patch' ' |
347 | test_create_repo conflict-merge && | |
348 | ( | |
349 | cd conflict-merge && | |
350 | test_commit init && | |
351 | echo one >>init.t && | |
352 | git commit -a -m one && | |
353 | echo two >>init.t && | |
354 | git commit -a -m two && | |
355 | git tag two && | |
356 | test_must_fail git rebase --merge --onto init HEAD^ && | |
357 | git rebase --show-current-patch >actual.patch && | |
358 | GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr && | |
fbd7a232 NTND |
359 | grep "show.*REBASE_HEAD" stderr && |
360 | test "$(git rev-parse REBASE_HEAD)" = "$(git rev-parse two)" | |
66335298 NTND |
361 | ) |
362 | ' | |
363 | ||
d03ebd41 ÆAB |
364 | test_expect_success 'rebase -c rebase.useBuiltin=false warning' ' |
365 | expected="rebase.useBuiltin support has been removed" && | |
366 | ||
367 | # Only warn when the legacy rebase is requested... | |
368 | test_must_fail git -c rebase.useBuiltin=false rebase 2>err && | |
369 | test_i18ngrep "$expected" err && | |
370 | test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err && | |
371 | test_i18ngrep "$expected" err && | |
372 | ||
373 | # ...not when we would have used the built-in anyway | |
374 | test_must_fail git -c rebase.useBuiltin=true rebase 2>err && | |
375 | test_must_be_empty err && | |
376 | test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err && | |
377 | test_must_be_empty err | |
378 | ' | |
379 | ||
294c695d | 380 | test_done |