t3200 (branch): fix '&&' chaining
[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" &&
43 git checkout -b nonlinear my-topic-branch &&
44 echo Edit >>B &&
45 git add B &&
46 git commit -m "Modify B" &&
47 git merge side &&
48 git checkout -b upstream-merged-nonlinear &&
49 git merge master &&
50 git checkout -f my-topic-branch &&
51 git tag topic
1308c17b
JS
52'
53
7a7eb517 54test_expect_success 'rebase on dirty worktree' '
e877a4c1
JN
55 echo dirty >>A &&
56 test_must_fail git rebase master
57'
7a7eb517
NTND
58
59test_expect_success 'rebase on dirty cache' '
e877a4c1
JN
60 git add A &&
61 test_must_fail git rebase master
62'
7a7eb517 63
1308c17b 64test_expect_success 'rebase against master' '
e877a4c1
JN
65 git reset --hard HEAD &&
66 git rebase master
67'
294c695d 68
7a7eb517 69test_expect_success 'rebase against master twice' '
e877a4c1
JN
70 git rebase master >out &&
71 grep "Current branch my-topic-branch is up to date" out
7a7eb517
NTND
72'
73
74test_expect_success 'rebase against master twice with --force' '
e877a4c1
JN
75 git rebase --force-rebase master >out &&
76 grep "Current branch my-topic-branch is up to date, rebase forced" out
7a7eb517
NTND
77'
78
79test_expect_success 'rebase against master twice from another branch' '
e877a4c1
JN
80 git checkout my-topic-branch^ &&
81 git rebase master my-topic-branch >out &&
82 grep "Current branch my-topic-branch is up to date" out
7a7eb517
NTND
83'
84
85test_expect_success 'rebase fast-forward to master' '
e877a4c1
JN
86 git checkout my-topic-branch^ &&
87 git rebase my-topic-branch >out &&
88 grep "Fast-forwarded HEAD to my-topic-branch" out
7a7eb517
NTND
89'
90
e877a4c1
JN
91test_expect_success 'the rebase operation should not have destroyed author information' '
92 ! (git log | grep "Author:" | grep "<>")
93'
294c695d 94
e877a4c1
JN
95test_expect_success 'the rebase operation should not have destroyed author information (2)' "
96 git log -1 |
97 grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
98"
43c23251 99
2559bff3 100test_expect_success 'HEAD was detached during rebase' '
e877a4c1 101 test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
2559bff3
JS
102'
103
1308c17b 104test_expect_success 'rebase after merge master' '
e877a4c1
JN
105 git reset --hard topic &&
106 git merge master &&
107 git rebase master &&
108 ! (git show | grep "^Merge:")
1308c17b
JS
109'
110
111test_expect_success 'rebase of history with merges is linearized' '
e877a4c1
JN
112 git checkout nonlinear &&
113 test 4 = $(git rev-list master.. | wc -l) &&
114 git rebase master &&
115 test 3 = $(git rev-list master.. | wc -l)
1308c17b
JS
116'
117
e877a4c1
JN
118test_expect_success 'rebase of history with merges after upstream merge is linearized' '
119 git checkout upstream-merged-nonlinear &&
120 test 5 = $(git rev-list master.. | wc -l) &&
121 git rebase master &&
122 test 3 = $(git rev-list master.. | wc -l)
1308c17b
JS
123'
124
ece7b749 125test_expect_success 'rebase a single mode change' '
e877a4c1
JN
126 git checkout master &&
127 echo 1 >X &&
128 git add X &&
129 test_tick &&
130 git commit -m prepare &&
131 git checkout -b modechange HEAD^ &&
132 echo 1 >X &&
133 git add X &&
134 test_chmod +x A &&
135 test_tick &&
136 git commit -m modechange &&
137 GIT_TRACE=1 git rebase master
ece7b749
JS
138'
139
840b3ca7
JH
140test_expect_success 'rebase is not broken by diff.renames' '
141 git config diff.renames copies &&
142 test_when_finished "git config --unset diff.renames" &&
143 git checkout filemove &&
144 GIT_TRACE=1 git rebase force-3way
145'
146
147test_expect_success 'setup: recover' '
148 test_might_fail git rebase --abort &&
149 git reset --hard &&
150 git checkout modechange
151'
152
3ec7371f 153test_expect_success 'Show verbose error when HEAD could not be detached' '
e877a4c1
JN
154 >B &&
155 test_must_fail git rebase topic 2>output.err >output.out &&
2eb54692
JH
156 grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
157 grep B output.err
3ec7371f 158'
bffd750a
JN
159rm -f B
160
15a147e6
MZ
161test_expect_success 'fail when upstream arg is missing and not on branch' '
162 git checkout topic &&
163 test_must_fail git rebase >output.out &&
164 grep "You are not currently on a branch" output.out
165'
166
167test_expect_success 'fail when upstream arg is missing and not configured' '
168 git checkout -b no-config topic &&
169 test_must_fail git rebase >output.out &&
170 grep "branch.no-config.merge" output.out
171'
172
173test_expect_success 'default to @{upstream} when upstream arg is missing' '
174 git checkout -b default topic &&
175 git config branch.default.remote .
176 git config branch.default.merge refs/heads/master
177 git rebase &&
178 test "$(git rev-parse default~1)" = "$(git rev-parse master)"
bffd750a 179'
3ec7371f 180
0e987a12 181test_expect_success 'rebase -q is quiet' '
e877a4c1
JN
182 git checkout -b quiet topic &&
183 git rebase -q master >output.out 2>&1 &&
184 test ! -s output.out
0e987a12
SB
185'
186
c2ca1d79
JH
187test_expect_success 'Rebase a commit that sprinkles CRs in' '
188 (
189 echo "One"
190 echo "TwoQ"
191 echo "Three"
192 echo "FQur"
193 echo "Five"
194 ) | q_to_cr >CR &&
195 git add CR &&
196 test_tick &&
197 git commit -a -m "A file with a line with CR" &&
198 git tag file-with-cr &&
199 git checkout HEAD^0 &&
200 git rebase --onto HEAD^^ HEAD^ &&
201 git diff --exit-code file-with-cr:CR HEAD:CR
202'
203
eb2151bb
TR
204test_expect_success 'rebase can copy notes' '
205 git config notes.rewrite.rebase true &&
206 git config notes.rewriteRef "refs/notes/*" &&
207 test_commit n1 &&
208 test_commit n2 &&
209 test_commit n3 &&
210 git notes add -m"a note" n3 &&
211 git rebase --onto n1 n2 &&
212 test "a note" = "$(git notes show HEAD)"
213'
214
215test_expect_success 'rebase -m can copy notes' '
216 git reset --hard n3 &&
217 git rebase -m --onto n1 n2 &&
218 test "a note" = "$(git notes show HEAD)"
219'
220
294c695d 221test_done