core.hidedotfiles: hide '.git' dir by default
[git/dscho.git] / t / t3400-rebase.sh
blob1de0ebda25c1034fc1b343a8f0e3da9c2c7f8c6e
1 #!/bin/sh
3 # Copyright (c) 2005 Amos Waterland
6 test_description='git rebase assorted tests
8 This test runs git rebase and checks that the author information is not lost
9 among other things.
11 . ./test-lib.sh
13 GIT_AUTHOR_NAME=author@name
14 GIT_AUTHOR_EMAIL=bogus@email@address
15 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
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 -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
54 test_expect_success 'rebase on dirty worktree' '
55 echo dirty >>A &&
56 test_must_fail git rebase master
59 test_expect_success 'rebase on dirty cache' '
60 git add A &&
61 test_must_fail git rebase master
64 test_expect_success 'rebase against master' '
65 git reset --hard HEAD &&
66 git rebase master
69 test_expect_success 'rebase against master twice' '
70 git rebase master >out &&
71 test_i18ngrep "Current branch my-topic-branch is up to date" out
74 test_expect_success 'rebase against master twice with --force' '
75 git rebase --force-rebase master >out &&
76 test_i18ngrep "Current branch my-topic-branch is up to date, rebase forced" out
79 test_expect_success 'rebase against master twice from another branch' '
80 git checkout my-topic-branch^ &&
81 git rebase master my-topic-branch >out &&
82 test_i18ngrep "Current branch my-topic-branch is up to date" out
85 test_expect_success 'rebase fast-forward to master' '
86 git checkout my-topic-branch^ &&
87 git rebase my-topic-branch >out &&
88 test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out
91 test_expect_success 'the rebase operation should not have destroyed author information' '
92 ! (git log | grep "Author:" | grep "<>")
95 test_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>'
100 test_expect_success 'HEAD was detached during rebase' '
101 test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
104 test_expect_success 'rebase after merge master' '
105 git reset --hard topic &&
106 git merge master &&
107 git rebase master &&
108 ! (git show | grep "^Merge:")
111 test_expect_success 'rebase of history with merges is linearized' '
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)
118 test_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)
125 test_expect_success 'rebase a single mode change' '
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
140 test_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
147 test_expect_success 'setup: recover' '
148 test_might_fail git rebase --abort &&
149 git reset --hard &&
150 git checkout modechange
153 test_expect_success 'Show verbose error when HEAD could not be detached' '
154 >B &&
155 test_must_fail git rebase topic 2>output.err >output.out &&
156 grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
157 grep B output.err
159 rm -f B
161 test_expect_success 'fail when upstream arg is missing and not on branch' '
162 git checkout topic &&
163 test_must_fail git rebase
166 test_expect_success 'fail when upstream arg is missing and not configured' '
167 git checkout -b no-config topic &&
168 test_must_fail git rebase
171 test_expect_success 'default to @{upstream} when upstream arg is missing' '
172 git checkout -b default topic &&
173 git config branch.default.remote . &&
174 git config branch.default.merge refs/heads/master &&
175 git rebase &&
176 test "$(git rev-parse default~1)" = "$(git rev-parse master)"
179 test_expect_success 'rebase -q is quiet' '
180 git checkout -b quiet topic &&
181 git rebase -q master >output.out 2>&1 &&
182 test ! -s output.out
185 test_expect_success 'Rebase a commit that sprinkles CRs in' '
187 echo "One"
188 echo "TwoQ"
189 echo "Three"
190 echo "FQur"
191 echo "Five"
192 ) | q_to_cr >CR &&
193 git add CR &&
194 test_tick &&
195 git commit -a -m "A file with a line with CR" &&
196 git tag file-with-cr &&
197 git checkout HEAD^0 &&
198 git rebase --onto HEAD^^ HEAD^ &&
199 git diff --exit-code file-with-cr:CR HEAD:CR
202 test_expect_success 'rebase can copy notes' '
203 git config notes.rewrite.rebase true &&
204 git config notes.rewriteRef "refs/notes/*" &&
205 test_commit n1 &&
206 test_commit n2 &&
207 test_commit n3 &&
208 git notes add -m"a note" n3 &&
209 git rebase --onto n1 n2 &&
210 test "a note" = "$(git notes show HEAD)"
213 test_expect_success 'rebase -m can copy notes' '
214 git reset --hard n3 &&
215 git rebase -m --onto n1 n2 &&
216 test "a note" = "$(git notes show HEAD)"
219 test_expect_success 'rebase commit with an ancient timestamp' '
220 git reset --hard &&
222 >old.one && git add old.one && test_tick &&
223 git commit --date="@12345 +0400" -m "Old one" &&
224 >old.two && git add old.two && test_tick &&
225 git commit --date="@23456 +0500" -m "Old two" &&
226 >old.three && git add old.three && test_tick &&
227 git commit --date="@34567 +0600" -m "Old three" &&
229 git cat-file commit HEAD^^ >actual &&
230 grep "author .* 12345 +0400$" actual &&
231 git cat-file commit HEAD^ >actual &&
232 grep "author .* 23456 +0500$" actual &&
233 git cat-file commit HEAD >actual &&
234 grep "author .* 34567 +0600$" actual &&
236 git rebase --onto HEAD^^ HEAD^ &&
238 git cat-file commit HEAD >actual &&
239 grep "author .* 34567 +0600$" actual
242 test_done