3 test_description='pulling into void'
8 sed -e "$1" <"$2" >"$2.x" &&
12 test_expect_success setup '
15 git commit -a -m original
18 test_expect_success 'pulling into void' '
25 test -f cloned/file &&
26 test_cmp file cloned/file
29 test_expect_success 'pulling into void using master:master' '
30 git init cloned-uho &&
33 git pull .. master:master
36 test -f cloned-uho/file &&
37 test_cmp file cloned-uho/file
40 test_expect_success 'pulling into void does not overwrite untracked files' '
41 git init cloned-untracked &&
43 cd cloned-untracked &&
44 echo untracked >file &&
45 test_must_fail git pull .. master &&
46 echo untracked >expect &&
51 test_expect_success 'pulling into void does not overwrite staged files' '
52 git init cloned-staged-colliding &&
54 cd cloned-staged-colliding &&
55 echo "alternate content" >file &&
57 test_must_fail git pull .. master &&
58 echo "alternate content" >expect &&
59 test_cmp expect file &&
60 git cat-file blob :file >file.index &&
61 test_cmp expect file.index
65 test_expect_success 'pulling into void does not remove new staged files' '
66 git init cloned-staged-new &&
68 cd cloned-staged-new &&
69 echo "new tracked file" >newfile &&
72 echo "new tracked file" >expect &&
73 test_cmp expect newfile &&
74 git cat-file blob :newfile >newfile.index &&
75 test_cmp expect newfile.index
79 test_expect_success 'pulling into void must not create an octopus' '
80 git init cloned-octopus &&
83 test_must_fail git pull .. master master &&
88 test_expect_success 'test . as a remote' '
89 git branch copy master &&
90 git config branch.copy.remote . &&
91 git config branch.copy.merge refs/heads/master &&
93 git commit -a -m updated &&
95 test "$(cat file)" = file &&
97 test "$(cat file)" = updated &&
98 git reflog -1 >reflog.actual &&
99 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
100 echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
101 test_cmp reflog.expected reflog.fuzzy
104 test_expect_success 'the default remote . should not break explicit pull' '
105 git checkout -b second master^ &&
106 echo modified >file &&
107 git commit -a -m modified &&
109 git reset --hard HEAD^ &&
110 test "$(cat file)" = file &&
112 test "$(cat file)" = modified &&
113 git reflog -1 >reflog.actual &&
114 sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
115 echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
116 test_cmp reflog.expected reflog.fuzzy
119 test_expect_success 'fail if wildcard spec does not match any refs' '
120 git checkout -b test copy^ &&
121 test_when_finished "git checkout -f copy && git branch -D test" &&
122 test "$(cat file)" = file &&
123 test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
124 test_i18ngrep "no candidates for merging" err &&
125 test "$(cat file)" = file
128 test_expect_success 'fail if no branches specified with non-default remote' '
129 git remote add test_remote . &&
130 test_when_finished "git remote remove test_remote" &&
131 git checkout -b test copy^ &&
132 test_when_finished "git checkout -f copy && git branch -D test" &&
133 test "$(cat file)" = file &&
134 test_config branch.test.remote origin &&
135 test_must_fail git pull test_remote 2>err &&
136 test_i18ngrep "specify a branch on the command line" err &&
137 test "$(cat file)" = file
140 test_expect_success 'fail if not on a branch' '
141 git remote add origin . &&
142 test_when_finished "git remote remove origin" &&
143 git checkout HEAD^ &&
144 test_when_finished "git checkout -f copy" &&
145 test "$(cat file)" = file &&
146 test_must_fail git pull 2>err &&
147 test_i18ngrep "not currently on a branch" err &&
148 test "$(cat file)" = file
151 test_expect_success 'fail if no configuration for current branch' '
152 git remote add test_remote . &&
153 test_when_finished "git remote remove test_remote" &&
154 git checkout -b test copy^ &&
155 test_when_finished "git checkout -f copy && git branch -D test" &&
156 test_config branch.test.remote test_remote &&
157 test "$(cat file)" = file &&
158 test_must_fail git pull 2>err &&
159 test_i18ngrep "no tracking information" err &&
160 test "$(cat file)" = file
163 test_expect_success 'pull --all: fail if no configuration for current branch' '
164 git remote add test_remote . &&
165 test_when_finished "git remote remove test_remote" &&
166 git checkout -b test copy^ &&
167 test_when_finished "git checkout -f copy && git branch -D test" &&
168 test_config branch.test.remote test_remote &&
169 test "$(cat file)" = file &&
170 test_must_fail git pull --all 2>err &&
171 test_i18ngrep "There is no tracking information" err &&
172 test "$(cat file)" = file
175 test_expect_success 'fail if upstream branch does not exist' '
176 git checkout -b test copy^ &&
177 test_when_finished "git checkout -f copy && git branch -D test" &&
178 test_config branch.test.remote . &&
179 test_config branch.test.merge refs/heads/nonexisting &&
180 test "$(cat file)" = file &&
181 test_must_fail git pull 2>err &&
182 test_i18ngrep "no such ref was fetched" err &&
183 test "$(cat file)" = file
186 test_expect_success 'fail if the index has unresolved entries' '
187 git checkout -b third second^ &&
188 test_when_finished "git checkout -f copy && git branch -D third" &&
189 test "$(cat file)" = file &&
190 test_commit modified2 file &&
191 test -z "$(git ls-files -u)" &&
192 test_must_fail git pull . second &&
193 test -n "$(git ls-files -u)" &&
195 test_must_fail git pull . second 2>err &&
196 test_i18ngrep "Pull is not possible because you have unmerged files" err &&
197 test_cmp expected file &&
199 test -z "$(git ls-files -u)" &&
200 test_must_fail git pull . second 2>err &&
201 test_i18ngrep "You have not concluded your merge" err &&
202 test_cmp expected file
205 test_expect_success 'fast-forwards working tree if branch head is updated' '
206 git checkout -b third second^ &&
207 test_when_finished "git checkout -f copy && git branch -D third" &&
208 test "$(cat file)" = file &&
209 git pull . second:third 2>err &&
210 test_i18ngrep "fetch updated the current branch head" err &&
211 test "$(cat file)" = modified &&
212 test "$(git rev-parse third)" = "$(git rev-parse second)"
215 test_expect_success 'fast-forward fails with conflicting work tree' '
216 git checkout -b third second^ &&
217 test_when_finished "git checkout -f copy && git branch -D third" &&
218 test "$(cat file)" = file &&
219 echo conflict >file &&
220 test_must_fail git pull . second:third 2>err &&
221 test_i18ngrep "Cannot fast-forward your working tree" err &&
222 test "$(cat file)" = conflict &&
223 test "$(git rev-parse third)" = "$(git rev-parse second)"
226 test_expect_success '--rebase' '
227 git branch to-rebase &&
228 echo modified again > file &&
229 git commit -m file file &&
230 git checkout to-rebase &&
233 git commit -m "new file" &&
234 git tag before-rebase &&
235 git pull --rebase . copy &&
236 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
237 test new = "$(git show HEAD:file2)"
240 test_expect_success '--rebase fails with multiple branches' '
241 git reset --hard before-rebase &&
242 test_must_fail git pull --rebase . copy master 2>err &&
243 test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
244 test_i18ngrep "Cannot rebase onto multiple branches" err &&
245 test modified = "$(git show HEAD:file)"
248 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
249 test_config rebase.autostash true &&
250 git reset --hard before-rebase &&
251 echo dirty >new_file &&
253 git pull --rebase . copy &&
254 test_cmp_rev HEAD^ copy &&
255 test "$(cat new_file)" = dirty &&
256 test "$(cat file)" = "modified again"
259 test_expect_success 'pull.rebase' '
260 git reset --hard before-rebase &&
261 test_config pull.rebase true &&
263 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
264 test new = "$(git show HEAD:file2)"
267 test_expect_success 'branch.to-rebase.rebase' '
268 git reset --hard before-rebase &&
269 test_config branch.to-rebase.rebase true &&
271 test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
272 test new = "$(git show HEAD:file2)"
275 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
276 git reset --hard before-rebase &&
277 test_config pull.rebase true &&
278 test_config branch.to-rebase.rebase false &&
280 test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
281 test new = "$(git show HEAD:file2)"
284 # add a feature branch, keep-merge, that is merged into master, so the
285 # test can try preserving the merge commit (or not) with various
286 # --rebase flags/pull.rebase settings.
287 test_expect_success 'preserve merge setup' '
288 git reset --hard before-rebase &&
289 git checkout -b keep-merge second^ &&
291 git checkout to-rebase &&
292 git merge keep-merge &&
293 git tag before-preserve-rebase
296 test_expect_success 'pull.rebase=false create a new merge commit' '
297 git reset --hard before-preserve-rebase &&
298 test_config pull.rebase false &&
300 test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
301 test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
302 test file3 = "$(git show HEAD:file3.t)"
305 test_expect_success 'pull.rebase=true flattens keep-merge' '
306 git reset --hard before-preserve-rebase &&
307 test_config pull.rebase true &&
309 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
310 test file3 = "$(git show HEAD:file3.t)"
313 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
314 git reset --hard before-preserve-rebase &&
315 test_config pull.rebase 1 &&
317 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
318 test file3 = "$(git show HEAD:file3.t)"
321 test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' '
322 git reset --hard before-preserve-rebase &&
323 test_config pull.rebase preserve &&
325 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
326 test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
329 test_expect_success 'pull.rebase=invalid fails' '
330 git reset --hard before-preserve-rebase &&
331 test_config pull.rebase invalid &&
335 test_expect_success '--rebase=false create a new merge commit' '
336 git reset --hard before-preserve-rebase &&
337 test_config pull.rebase true &&
338 git pull --rebase=false . copy &&
339 test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
340 test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
341 test file3 = "$(git show HEAD:file3.t)"
344 test_expect_success '--rebase=true rebases and flattens keep-merge' '
345 git reset --hard before-preserve-rebase &&
346 test_config pull.rebase preserve &&
347 git pull --rebase=true . copy &&
348 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
349 test file3 = "$(git show HEAD:file3.t)"
352 test_expect_success '--rebase=preserve rebases and merges keep-merge' '
353 git reset --hard before-preserve-rebase &&
354 test_config pull.rebase true &&
355 git pull --rebase=preserve . copy &&
356 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
357 test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
360 test_expect_success '--rebase=invalid fails' '
361 git reset --hard before-preserve-rebase &&
362 ! git pull --rebase=invalid . copy
365 test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
366 git reset --hard before-preserve-rebase &&
367 test_config pull.rebase preserve &&
368 git pull --rebase . copy &&
369 test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
370 test file3 = "$(git show HEAD:file3.t)"
373 test_expect_success '--rebase with rebased upstream' '
375 git remote add -f me . &&
378 git reset --hard HEAD^ &&
379 echo conflicting modification > file &&
380 git commit -m conflict file &&
381 git checkout to-rebase &&
383 git commit -m to-rebase file2 &&
384 git tag to-rebase-orig &&
385 git pull --rebase me copy &&
386 test "conflicting modification" = "$(cat file)" &&
387 test file = "$(cat file2)"
391 test_expect_success '--rebase -f with rebased upstream' '
392 test_when_finished "test_might_fail git rebase --abort" &&
393 git reset --hard to-rebase-orig &&
394 git pull --rebase -f me copy &&
395 test "conflicting modification" = "$(cat file)" &&
396 test file = "$(cat file2)"
399 test_expect_success '--rebase with rebased default upstream' '
401 git update-ref refs/remotes/me/copy copy-orig &&
402 git checkout --track -b to-rebase2 me/copy &&
403 git reset --hard to-rebase-orig &&
405 test "conflicting modification" = "$(cat file)" &&
406 test file = "$(cat file2)"
410 test_expect_success 'rebased upstream + fetch + pull --rebase' '
412 git update-ref refs/remotes/me/copy copy-orig &&
413 git reset --hard to-rebase-orig &&
414 git checkout --track -b to-rebase3 me/copy &&
415 git reset --hard to-rebase-orig &&
418 test "conflicting modification" = "$(cat file)" &&
419 test file = "$(cat file2)"
423 test_expect_success 'pull --rebase dies early with dirty working directory' '
425 git checkout to-rebase &&
426 git update-ref refs/remotes/me/copy copy^ &&
427 COPY="$(git rev-parse --verify me/copy)" &&
428 git rebase --onto $COPY copy &&
429 test_config branch.to-rebase.remote me &&
430 test_config branch.to-rebase.merge refs/heads/copy &&
431 test_config branch.to-rebase.rebase true &&
432 echo dirty >> file &&
434 test_must_fail git pull &&
435 test "$COPY" = "$(git rev-parse --verify me/copy)" &&
436 git checkout HEAD -- file &&
438 test "$COPY" != "$(git rev-parse --verify me/copy)"
442 test_expect_success 'pull --rebase works on branch yet to be born' '
443 git rev-parse master >expect &&
447 git pull --rebase .. master &&
448 git rev-parse HEAD >../actual
450 test_cmp expect actual
453 test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
454 test_when_finished "rm -rf empty_repo2" &&
455 git init empty_repo2 &&
458 echo staged-file >staged-file &&
459 git add staged-file &&
460 test "$(git ls-files)" = staged-file &&
461 test_must_fail git pull --rebase .. master 2>err &&
462 test "$(git ls-files)" = staged-file &&
463 test "$(git show :staged-file)" = staged-file &&
464 test_i18ngrep "unborn branch with changes added to the index" err
468 test_expect_success 'setup for detecting upstreamed changes' '
472 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
474 git commit -m "Initial revision"
478 modify s/5/43/ stuff &&
479 git commit -a -m "5->43" &&
480 modify s/6/42/ stuff &&
481 git commit -a -m "Make it bigger"
484 modify s/5/43/ stuff &&
485 git commit -a -m "Independent discovery of 5->43"
489 test_expect_success 'git pull --rebase detects upstreamed changes' '
492 test -z "$(git ls-files -u)"
496 test_expect_success 'setup for avoiding reapplying old patches' '
498 test_might_fail git rebase --abort &&
499 git reset --hard origin/master
501 git clone --bare src src-replace.git &&
503 mv src-replace.git src &&
505 modify s/2/22/ stuff &&
506 git commit -a -m "Change 2" &&
507 modify s/3/33/ stuff &&
508 git commit -a -m "Change 3" &&
509 modify s/4/44/ stuff &&
510 git commit -a -m "Change 4" &&
513 modify s/44/55/ stuff &&
514 git commit --amend -a -m "Modified Change 4"
518 test_expect_success 'git pull --rebase does not reapply old patches' '
520 test_must_fail git pull --rebase &&
521 test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
525 test_expect_success 'git pull --rebase against local branch' '
526 git checkout -b copy2 to-rebase-orig &&
527 git pull --rebase . to-rebase &&
528 test "conflicting modification" = "$(cat file)" &&
529 test file = "$(cat file2)"