Git 1.9.0
[git/git.git] / t / t3400-rebase.sh
CommitLineData
294c695d
AW
1#!/bin/sh
2#
3# Copyright (c) 2005 Amos Waterland
4#
5
c2ca1d79 6test_description='git rebase assorted tests
294c695d 7
c2ca1d79
JH
8This test runs git rebase and checks that the author information is not lost
9among other things.
294c695d
AW
10'
11. ./test-lib.sh
12
43c23251
JS
13GIT_AUTHOR_NAME=author@name
14GIT_AUTHOR_EMAIL=bogus@email@address
15export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
294c695d 16
e877a4c1
JN
17test_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 47test_expect_success 'rebase on dirty worktree' '
e877a4c1
JN
48 echo dirty >>A &&
49 test_must_fail git rebase master
50'
7a7eb517
NTND
51
52test_expect_success 'rebase on dirty cache' '
e877a4c1
JN
53 git add A &&
54 test_must_fail git rebase master
55'
7a7eb517 56
1308c17b 57test_expect_success 'rebase against master' '
e877a4c1
JN
58 git reset --hard HEAD &&
59 git rebase master
60'
294c695d 61
2e6e276d 62test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
6567dc05
RR
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
e877a4c1
JN
73test_expect_success 'the rebase operation should not have destroyed author information' '
74 ! (git log | grep "Author:" | grep "<>")
75'
294c695d 76
e877a4c1
JN
77test_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"
43c23251 81
2559bff3 82test_expect_success 'HEAD was detached during rebase' '
e877a4c1 83 test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
2559bff3
JS
84'
85
ea709800
PH
86test_expect_success 'rebase from ambiguous branch name' '
87 git checkout -b topic side &&
88 git rebase master
89'
90
ece7b749 91test_expect_success 'rebase a single mode change' '
e877a4c1 92 git checkout master &&
3f213981 93 git branch -D topic &&
e877a4c1
JN
94 echo 1 >X &&
95 git add X &&
96 test_tick &&
97 git commit -m prepare &&
98 git checkout -b modechange HEAD^ &&
99 echo 1 >X &&
100 git add X &&
101 test_chmod +x A &&
102 test_tick &&
103 git commit -m modechange &&
104 GIT_TRACE=1 git rebase master
ece7b749
JS
105'
106
840b3ca7 107test_expect_success 'rebase is not broken by diff.renames' '
55adef06 108 test_config diff.renames copies &&
840b3ca7
JH
109 git checkout filemove &&
110 GIT_TRACE=1 git rebase force-3way
111'
112
113test_expect_success 'setup: recover' '
114 test_might_fail git rebase --abort &&
115 git reset --hard &&
116 git checkout modechange
117'
118
3ec7371f 119test_expect_success 'Show verbose error when HEAD could not be detached' '
e877a4c1
JN
120 >B &&
121 test_must_fail git rebase topic 2>output.err >output.out &&
2eb54692
JH
122 grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
123 grep B output.err
3ec7371f 124'
bffd750a
JN
125rm -f B
126
15a147e6
MZ
127test_expect_success 'fail when upstream arg is missing and not on branch' '
128 git checkout topic &&
3c02396a 129 test_must_fail git rebase
15a147e6
MZ
130'
131
132test_expect_success 'fail when upstream arg is missing and not configured' '
133 git checkout -b no-config topic &&
3c02396a 134 test_must_fail git rebase
15a147e6
MZ
135'
136
ad8261d2 137test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
bb3f4583 138 git checkout -b default-base master &&
15a147e6 139 git checkout -b default topic &&
02380389 140 git config branch.default.remote . &&
bb3f4583 141 git config branch.default.merge refs/heads/default-base &&
15a147e6 142 git rebase &&
bb3f4583
JK
143 git rev-parse --verify default-base >expect &&
144 git rev-parse default~1 >actual &&
145 test_cmp expect actual &&
146 git checkout default-base &&
147 git reset --hard HEAD^ &&
148 git checkout default &&
149 git rebase &&
150 git rev-parse --verify default-base >expect &&
ad8261d2
JK
151 git rev-parse default~1 >actual &&
152 test_cmp expect actual
bffd750a 153'
3ec7371f 154
0e987a12 155test_expect_success 'rebase -q is quiet' '
e877a4c1
JN
156 git checkout -b quiet topic &&
157 git rebase -q master >output.out 2>&1 &&
ca8d148d 158 test_must_be_empty output.out
0e987a12
SB
159'
160
c2ca1d79
JH
161test_expect_success 'Rebase a commit that sprinkles CRs in' '
162 (
163 echo "One"
164 echo "TwoQ"
165 echo "Three"
166 echo "FQur"
167 echo "Five"
168 ) | q_to_cr >CR &&
169 git add CR &&
170 test_tick &&
171 git commit -a -m "A file with a line with CR" &&
172 git tag file-with-cr &&
173 git checkout HEAD^0 &&
174 git rebase --onto HEAD^^ HEAD^ &&
175 git diff --exit-code file-with-cr:CR HEAD:CR
176'
177
eb2151bb
TR
178test_expect_success 'rebase can copy notes' '
179 git config notes.rewrite.rebase true &&
180 git config notes.rewriteRef "refs/notes/*" &&
181 test_commit n1 &&
182 test_commit n2 &&
183 test_commit n3 &&
184 git notes add -m"a note" n3 &&
185 git rebase --onto n1 n2 &&
186 test "a note" = "$(git notes show HEAD)"
187'
188
189test_expect_success 'rebase -m can copy notes' '
190 git reset --hard n3 &&
191 git rebase -m --onto n1 n2 &&
192 test "a note" = "$(git notes show HEAD)"
193'
194
2c733fb2
JH
195test_expect_success 'rebase commit with an ancient timestamp' '
196 git reset --hard &&
197
198 >old.one && git add old.one && test_tick &&
199 git commit --date="@12345 +0400" -m "Old one" &&
200 >old.two && git add old.two && test_tick &&
201 git commit --date="@23456 +0500" -m "Old two" &&
202 >old.three && git add old.three && test_tick &&
203 git commit --date="@34567 +0600" -m "Old three" &&
204
205 git cat-file commit HEAD^^ >actual &&
206 grep "author .* 12345 +0400$" actual &&
207 git cat-file commit HEAD^ >actual &&
208 grep "author .* 23456 +0500$" actual &&
209 git cat-file commit HEAD >actual &&
210 grep "author .* 34567 +0600$" actual &&
211
212 git rebase --onto HEAD^^ HEAD^ &&
213
214 git cat-file commit HEAD >actual &&
215 grep "author .* 34567 +0600$" actual
216'
217
294c695d 218test_done