t/t5520-pull.sh

   1 #!/bin/sh
   2
   3 test_description='pulling into void'
   4
   5 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
   6 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
   7
   8 . ./test-lib.sh
   9
  10 modify () {
  11         sed -e "$1" "$2" >"$2.x" &&
  12         mv "$2.x" "$2"
  13 }
  14
  15 test_pull_autostash () {
  16         expect_parent_num="$1" &&
  17         shift &&
  18         git reset --hard before-rebase &&
  19         echo dirty >new_file &&
  20         git add new_file &&
  21         git pull "$@" . copy &&
  22         test_cmp_rev HEAD^"$expect_parent_num" copy &&
  23         echo dirty >expect &&
  24         test_cmp expect new_file &&
  25         echo "modified again" >expect &&
  26         test_cmp expect file
  27 }
  28
  29 test_pull_autostash_fail () {
  30         git reset --hard before-rebase &&
  31         echo dirty >new_file &&
  32         git add new_file &&
  33         test_must_fail git pull "$@" . copy 2>err &&
  34         test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
  35 }
  36
  37 test_expect_success setup '
  38         echo file >file &&
  39         git add file &&
  40         git commit -a -m original
  41 '
  42
  43 test_expect_success 'pulling into void' '
  44         git init cloned &&
  45         (
  46                 cd cloned &&
  47                 git pull ..
  48         ) &&
  49         test_path_is_file file &&
  50         test_path_is_file cloned/file &&
  51         test_cmp file cloned/file
  52 '
  53
  54 test_expect_success 'pulling into void using main:main' '
  55         git init cloned-uho &&
  56         (
  57                 cd cloned-uho &&
  58                 git pull .. main:main
  59         ) &&
  60         test_path_is_file file &&
  61         test_path_is_file cloned-uho/file &&
  62         test_cmp file cloned-uho/file
  63 '
  64
  65 test_expect_success 'pulling into void does not overwrite untracked files' '
  66         git init cloned-untracked &&
  67         (
  68                 cd cloned-untracked &&
  69                 echo untracked >file &&
  70                 test_must_fail git pull .. main &&
  71                 echo untracked >expect &&
  72                 test_cmp expect file
  73         )
  74 '
  75
  76 test_expect_success 'pulling into void does not overwrite staged files' '
  77         git init cloned-staged-colliding &&
  78         (
  79                 cd cloned-staged-colliding &&
  80                 echo "alternate content" >file &&
  81                 git add file &&
  82                 test_must_fail git pull .. main &&
  83                 echo "alternate content" >expect &&
  84                 test_cmp expect file &&
  85                 git cat-file blob :file >file.index &&
  86                 test_cmp expect file.index
  87         )
  88 '
  89
  90 test_expect_success 'pulling into void does not remove new staged files' '
  91         git init cloned-staged-new &&
  92         (
  93                 cd cloned-staged-new &&
  94                 echo "new tracked file" >newfile &&
  95                 git add newfile &&
  96                 git pull .. main &&
  97                 echo "new tracked file" >expect &&
  98                 test_cmp expect newfile &&
  99                 git cat-file blob :newfile >newfile.index &&
 100                 test_cmp expect newfile.index
 101         )
 102 '
 103
 104 test_expect_success 'pulling into void must not create an octopus' '
 105         git init cloned-octopus &&
 106         (
 107                 cd cloned-octopus &&
 108                 test_must_fail git pull .. main main &&
 109                 test_path_is_missing file
 110         )
 111 '
 112
 113 test_expect_success 'test . as a remote' '
 114         git branch copy main &&
 115         git config branch.copy.remote . &&
 116         git config branch.copy.merge refs/heads/main &&
 117         echo updated >file &&
 118         git commit -a -m updated &&
 119         git checkout copy &&
 120         echo file >expect &&
 121         test_cmp expect file &&
 122         git pull &&
 123         echo updated >expect &&
 124         test_cmp expect file &&
 125         git reflog -1 >reflog.actual &&
 126         sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 127         echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
 128         test_cmp reflog.expected reflog.fuzzy
 129 '
 130
 131 test_expect_success 'the default remote . should not break explicit pull' '
 132         git checkout -b second main^ &&
 133         echo modified >file &&
 134         git commit -a -m modified &&
 135         git checkout copy &&
 136         git reset --hard HEAD^ &&
 137         echo file >expect &&
 138         test_cmp expect file &&
 139         git pull --no-rebase . second &&
 140         echo modified >expect &&
 141         test_cmp expect file &&
 142         git reflog -1 >reflog.actual &&
 143         sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 144         echo "OBJID HEAD@{0}: pull --no-rebase . second: Fast-forward" >reflog.expected &&
 145         test_cmp reflog.expected reflog.fuzzy
 146 '
 147
 148 test_expect_success 'fail if wildcard spec does not match any refs' '
 149         git checkout -b test copy^ &&
 150         test_when_finished "git checkout -f copy && git branch -D test" &&
 151         echo file >expect &&
 152         test_cmp expect file &&
 153         test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
 154         test_i18ngrep "no candidates for merging" err &&
 155         test_cmp expect file
 156 '
 157
 158 test_expect_success 'fail if no branches specified with non-default remote' '
 159         git remote add test_remote . &&
 160         test_when_finished "git remote remove test_remote" &&
 161         git checkout -b test copy^ &&
 162         test_when_finished "git checkout -f copy && git branch -D test" &&
 163         echo file >expect &&
 164         test_cmp expect file &&
 165         test_config branch.test.remote origin &&
 166         test_must_fail git pull test_remote 2>err &&
 167         test_i18ngrep "specify a branch on the command line" err &&
 168         test_cmp expect file
 169 '
 170
 171 test_expect_success 'fail if not on a branch' '
 172         git remote add origin . &&
 173         test_when_finished "git remote remove origin" &&
 174         git checkout HEAD^ &&
 175         test_when_finished "git checkout -f copy" &&
 176         echo file >expect &&
 177         test_cmp expect file &&
 178         test_must_fail git pull 2>err &&
 179         test_i18ngrep "not currently on a branch" err &&
 180         test_cmp expect file
 181 '
 182
 183 test_expect_success 'fail if no configuration for current branch' '
 184         git remote add test_remote . &&
 185         test_when_finished "git remote remove test_remote" &&
 186         git checkout -b test copy^ &&
 187         test_when_finished "git checkout -f copy && git branch -D test" &&
 188         test_config branch.test.remote test_remote &&
 189         echo file >expect &&
 190         test_cmp expect file &&
 191         test_must_fail git pull 2>err &&
 192         test_i18ngrep "no tracking information" err &&
 193         test_cmp expect file
 194 '
 195
 196 test_expect_success 'pull --all: fail if no configuration for current branch' '
 197         git remote add test_remote . &&
 198         test_when_finished "git remote remove test_remote" &&
 199         git checkout -b test copy^ &&
 200         test_when_finished "git checkout -f copy && git branch -D test" &&
 201         test_config branch.test.remote test_remote &&
 202         echo file >expect &&
 203         test_cmp expect file &&
 204         test_must_fail git pull --all 2>err &&
 205         test_i18ngrep "There is no tracking information" err &&
 206         test_cmp expect file
 207 '
 208
 209 test_expect_success 'fail if upstream branch does not exist' '
 210         git checkout -b test copy^ &&
 211         test_when_finished "git checkout -f copy && git branch -D test" &&
 212         test_config branch.test.remote . &&
 213         test_config branch.test.merge refs/heads/nonexisting &&
 214         echo file >expect &&
 215         test_cmp expect file &&
 216         test_must_fail git pull 2>err &&
 217         test_i18ngrep "no such ref was fetched" err &&
 218         test_cmp expect file
 219 '
 220
 221 test_expect_success 'fail if the index has unresolved entries' '
 222         git checkout -b third second^ &&
 223         test_when_finished "git checkout -f copy && git branch -D third" &&
 224         echo file >expect &&
 225         test_cmp expect file &&
 226         test_commit modified2 file &&
 227         git ls-files -u >unmerged &&
 228         test_must_be_empty unmerged &&
 229         test_must_fail git pull --no-rebase . second &&
 230         git ls-files -u >unmerged &&
 231         test_file_not_empty unmerged &&
 232         cp file expected &&
 233         test_must_fail git pull . second 2>err &&
 234         test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
 235         test_cmp expected file &&
 236         git add file &&
 237         git ls-files -u >unmerged &&
 238         test_must_be_empty unmerged &&
 239         test_must_fail git pull . second 2>err &&
 240         test_i18ngrep "You have not concluded your merge" err &&
 241         test_cmp expected file
 242 '
 243
 244 test_expect_success 'fast-forwards working tree if branch head is updated' '
 245         git checkout -b third second^ &&
 246         test_when_finished "git checkout -f copy && git branch -D third" &&
 247         echo file >expect &&
 248         test_cmp expect file &&
 249         git pull . second:third 2>err &&
 250         test_i18ngrep "fetch updated the current branch head" err &&
 251         echo modified >expect &&
 252         test_cmp expect file &&
 253         test_cmp_rev third second
 254 '
 255
 256 test_expect_success 'fast-forward fails with conflicting work tree' '
 257         git checkout -b third second^ &&
 258         test_when_finished "git checkout -f copy && git branch -D third" &&
 259         echo file >expect &&
 260         test_cmp expect file &&
 261         echo conflict >file &&
 262         test_must_fail git pull . second:third 2>err &&
 263         test_i18ngrep "Cannot fast-forward your working tree" err &&
 264         echo conflict >expect &&
 265         test_cmp expect file &&
 266         test_cmp_rev third second
 267 '
 268
 269 test_expect_success '--rebase' '
 270         git branch to-rebase &&
 271         echo modified again >file &&
 272         git commit -m file file &&
 273         git checkout to-rebase &&
 274         echo new >file2 &&
 275         git add file2 &&
 276         git commit -m "new file" &&
 277         git tag before-rebase &&
 278         git pull --rebase . copy &&
 279         test_cmp_rev HEAD^ copy &&
 280         echo new >expect &&
 281         git show HEAD:file2 >actual &&
 282         test_cmp expect actual
 283 '
 284
 285 test_expect_success '--rebase (merge) fast forward' '
 286         git reset --hard before-rebase &&
 287         git checkout -b ff &&
 288         echo another modification >file &&
 289         git commit -m third file &&
 290
 291         git checkout to-rebase &&
 292         git -c rebase.backend=merge pull --rebase . ff &&
 293         test_cmp_rev HEAD ff &&
 294
 295         # The above only validates the result.  Did we actually bypass rebase?
 296         git reflog -1 >reflog.actual &&
 297         sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 298         echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
 299         test_cmp reflog.expected reflog.fuzzy
 300 '
 301
 302 test_expect_success '--rebase (am) fast forward' '
 303         git reset --hard before-rebase &&
 304
 305         git -c rebase.backend=apply pull --rebase . ff &&
 306         test_cmp_rev HEAD ff &&
 307
 308         # The above only validates the result.  Did we actually bypass rebase?
 309         git reflog -1 >reflog.actual &&
 310         sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 311         echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
 312         test_cmp reflog.expected reflog.fuzzy
 313 '
 314
 315 test_expect_success '--rebase --autostash fast forward' '
 316         test_when_finished "
 317                 git reset --hard
 318                 git checkout to-rebase
 319                 git branch -D to-rebase-ff
 320                 git branch -D behind" &&
 321         git branch behind &&
 322         git checkout -b to-rebase-ff &&
 323         echo another modification >>file &&
 324         git add file &&
 325         git commit -m mod &&
 326
 327         git checkout behind &&
 328         echo dirty >file &&
 329         git pull --rebase --autostash . to-rebase-ff &&
 330         test_cmp_rev HEAD to-rebase-ff
 331 '
 332
 333 test_expect_success '--rebase with conflicts shows advice' '
 334         test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
 335         git checkout -b seq &&
 336         test_seq 5 >seq.txt &&
 337         git add seq.txt &&
 338         test_tick &&
 339         git commit -m "Add seq.txt" &&
 340         echo 6 >>seq.txt &&
 341         test_tick &&
 342         git commit -m "Append to seq.txt" seq.txt &&
 343         git checkout -b with-conflicts HEAD^ &&
 344         echo conflicting >>seq.txt &&
 345         test_tick &&
 346         git commit -m "Create conflict" seq.txt &&
 347         test_must_fail git pull --rebase . seq 2>err >out &&
 348         test_i18ngrep "Resolve all conflicts manually" err
 349 '
 350
 351 test_expect_success 'failed --rebase shows advice' '
 352         test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
 353         git checkout -b diverging &&
 354         test_commit attributes .gitattributes "* text=auto" attrs &&
 355         sha1="$(printf "1\\r\\n" | git hash-object -w --stdin)" &&
 356         git update-index --cacheinfo 0644 $sha1 file &&
 357         git commit -m v1-with-cr &&
 358         # force checkout because `git reset --hard` will not leave clean `file`
 359         git checkout -f -b fails-to-rebase HEAD^ &&
 360         test_commit v2-without-cr file "2" file2-lf &&
 361         test_must_fail git pull --rebase . diverging 2>err >out &&
 362         test_i18ngrep "Resolve all conflicts manually" err
 363 '
 364
 365 test_expect_success '--rebase fails with multiple branches' '
 366         git reset --hard before-rebase &&
 367         test_must_fail git pull --rebase . copy main 2>err &&
 368         test_cmp_rev HEAD before-rebase &&
 369         test_i18ngrep "Cannot rebase onto multiple branches" err &&
 370         echo modified >expect &&
 371         git show HEAD:file >actual &&
 372         test_cmp expect actual
 373 '
 374
 375 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
 376         test_config rebase.autostash true &&
 377         test_pull_autostash 1 --rebase
 378 '
 379
 380 test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
 381         test_config rebase.autostash true &&
 382         test_pull_autostash 1 --rebase --autostash
 383 '
 384
 385 test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
 386         test_config rebase.autostash false &&
 387         test_pull_autostash 1 --rebase --autostash
 388 '
 389
 390 test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
 391         test_unconfig rebase.autostash &&
 392         test_pull_autostash 1 --rebase --autostash
 393 '
 394
 395 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
 396         test_config rebase.autostash true &&
 397         test_pull_autostash_fail --rebase --no-autostash
 398 '
 399
 400 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
 401         test_config rebase.autostash false &&
 402         test_pull_autostash_fail --rebase --no-autostash
 403 '
 404
 405 test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
 406         test_unconfig rebase.autostash &&
 407         test_pull_autostash_fail --rebase --no-autostash
 408 '
 409
 410 test_expect_success 'pull succeeds with dirty working directory and merge.autostash set' '
 411         test_config merge.autostash true &&
 412         test_pull_autostash 2 --no-rebase
 413 '
 414
 415 test_expect_success 'pull --autostash & merge.autostash=true' '
 416         test_config merge.autostash true &&
 417         test_pull_autostash 2 --autostash --no-rebase
 418 '
 419
 420 test_expect_success 'pull --autostash & merge.autostash=false' '
 421         test_config merge.autostash false &&
 422         test_pull_autostash 2 --autostash --no-rebase
 423 '
 424
 425 test_expect_success 'pull --autostash & merge.autostash unset' '
 426         test_unconfig merge.autostash &&
 427         test_pull_autostash 2 --autostash --no-rebase
 428 '
 429
 430 test_expect_success 'pull --no-autostash & merge.autostash=true' '
 431         test_config merge.autostash true &&
 432         test_pull_autostash_fail --no-autostash --no-rebase
 433 '
 434
 435 test_expect_success 'pull --no-autostash & merge.autostash=false' '
 436         test_config merge.autostash false &&
 437         test_pull_autostash_fail --no-autostash --no-rebase
 438 '
 439
 440 test_expect_success 'pull --no-autostash & merge.autostash unset' '
 441         test_unconfig merge.autostash &&
 442         test_pull_autostash_fail --no-autostash --no-rebase
 443 '
 444
 445 test_expect_success 'pull.rebase' '
 446         git reset --hard before-rebase &&
 447         test_config pull.rebase true &&
 448         git pull . copy &&
 449         test_cmp_rev HEAD^ copy &&
 450         echo new >expect &&
 451         git show HEAD:file2 >actual &&
 452         test_cmp expect actual
 453 '
 454
 455 test_expect_success 'pull --autostash & pull.rebase=true' '
 456         test_config pull.rebase true &&
 457         test_pull_autostash 1 --autostash
 458 '
 459
 460 test_expect_success 'pull --no-autostash & pull.rebase=true' '
 461         test_config pull.rebase true &&
 462         test_pull_autostash_fail --no-autostash
 463 '
 464
 465 test_expect_success 'branch.to-rebase.rebase' '
 466         git reset --hard before-rebase &&
 467         test_config branch.to-rebase.rebase true &&
 468         git pull . copy &&
 469         test_cmp_rev HEAD^ copy &&
 470         echo new >expect &&
 471         git show HEAD:file2 >actual &&
 472         test_cmp expect actual
 473 '
 474
 475 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
 476         git reset --hard before-rebase &&
 477         test_config pull.rebase true &&
 478         test_config branch.to-rebase.rebase false &&
 479         git pull . copy &&
 480         test_cmp_rev ! HEAD^ copy &&
 481         echo new >expect &&
 482         git show HEAD:file2 >actual &&
 483         test_cmp expect actual
 484 '
 485
 486 test_expect_success 'pull --rebase warns on --verify-signatures' '
 487         git reset --hard before-rebase &&
 488         git pull --rebase --verify-signatures . copy 2>err &&
 489         test_cmp_rev HEAD^ copy &&
 490         echo new >expect &&
 491         git show HEAD:file2 >actual &&
 492         test_cmp expect actual &&
 493         test_i18ngrep "ignoring --verify-signatures for rebase" err
 494 '
 495
 496 test_expect_success 'pull --rebase does not warn on --no-verify-signatures' '
 497         git reset --hard before-rebase &&
 498         git pull --rebase --no-verify-signatures . copy 2>err &&
 499         test_cmp_rev HEAD^ copy &&
 500         echo new >expect &&
 501         git show HEAD:file2 >actual &&
 502         test_cmp expect actual &&
 503         test_i18ngrep ! "verify-signatures" err
 504 '
 505
 506 # add a feature branch, keep-merge, that is merged into main, so the
 507 # test can try preserving the merge commit (or not) with various
 508 # --rebase flags/pull.rebase settings.
 509 test_expect_success 'preserve merge setup' '
 510         git reset --hard before-rebase &&
 511         git checkout -b keep-merge second^ &&
 512         test_commit file3 &&
 513         git checkout to-rebase &&
 514         git merge keep-merge &&
 515         git tag before-preserve-rebase
 516 '
 517
 518 test_expect_success 'pull.rebase=false create a new merge commit' '
 519         git reset --hard before-preserve-rebase &&
 520         test_config pull.rebase false &&
 521         git pull . copy &&
 522         test_cmp_rev HEAD^1 before-preserve-rebase &&
 523         test_cmp_rev HEAD^2 copy &&
 524         echo file3 >expect &&
 525         git show HEAD:file3.t >actual &&
 526         test_cmp expect actual
 527 '
 528
 529 test_expect_success 'pull.rebase=true flattens keep-merge' '
 530         git reset --hard before-preserve-rebase &&
 531         test_config pull.rebase true &&
 532         git pull . copy &&
 533         test_cmp_rev HEAD^^ copy &&
 534         echo file3 >expect &&
 535         git show HEAD:file3.t >actual &&
 536         test_cmp expect actual
 537 '
 538
 539 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
 540         git reset --hard before-preserve-rebase &&
 541         test_config pull.rebase 1 &&
 542         git pull . copy &&
 543         test_cmp_rev HEAD^^ copy &&
 544         echo file3 >expect &&
 545         git show HEAD:file3.t >actual &&
 546         test_cmp expect actual
 547 '
 548
 549 test_expect_success 'pull.rebase=interactive' '
 550         write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
 551         echo I was here >fake.out &&
 552         false
 553         EOF
 554         test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
 555         test_when_finished "test_might_fail git rebase --abort" &&
 556         test_must_fail git pull --rebase=interactive . copy &&
 557         echo "I was here" >expect &&
 558         test_cmp expect fake.out
 559 '
 560
 561 test_expect_success 'pull --rebase=i' '
 562         write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
 563         echo I was here, too >fake.out &&
 564         false
 565         EOF
 566         test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
 567         test_when_finished "test_might_fail git rebase --abort" &&
 568         test_must_fail git pull --rebase=i . copy &&
 569         echo "I was here, too" >expect &&
 570         test_cmp expect fake.out
 571 '
 572
 573 test_expect_success 'pull.rebase=invalid fails' '
 574         git reset --hard before-preserve-rebase &&
 575         test_config pull.rebase invalid &&
 576         test_must_fail git pull . copy
 577 '
 578
 579 test_expect_success '--rebase=false create a new merge commit' '
 580         git reset --hard before-preserve-rebase &&
 581         test_config pull.rebase true &&
 582         git pull --rebase=false . copy &&
 583         test_cmp_rev HEAD^1 before-preserve-rebase &&
 584         test_cmp_rev HEAD^2 copy &&
 585         echo file3 >expect &&
 586         git show HEAD:file3.t >actual &&
 587         test_cmp expect actual
 588 '
 589
 590 test_expect_success '--rebase=true rebases and flattens keep-merge' '
 591         git reset --hard before-preserve-rebase &&
 592         test_config pull.rebase merges &&
 593         git pull --rebase=true . copy &&
 594         test_cmp_rev HEAD^^ copy &&
 595         echo file3 >expect &&
 596         git show HEAD:file3.t >actual &&
 597         test_cmp expect actual
 598 '
 599
 600 test_expect_success '--rebase=invalid fails' '
 601         git reset --hard before-preserve-rebase &&
 602         test_must_fail git pull --rebase=invalid . copy
 603 '
 604
 605 test_expect_success '--rebase overrides pull.rebase=merges and flattens keep-merge' '
 606         git reset --hard before-preserve-rebase &&
 607         test_config pull.rebase merges &&
 608         git pull --rebase . copy &&
 609         test_cmp_rev HEAD^^ copy &&
 610         echo file3 >expect &&
 611         git show HEAD:file3.t >actual &&
 612         test_cmp expect actual
 613 '
 614
 615 test_expect_success '--rebase with rebased upstream' '
 616         git remote add -f me . &&
 617         git checkout copy &&
 618         git tag copy-orig &&
 619         git reset --hard HEAD^ &&
 620         echo conflicting modification >file &&
 621         git commit -m conflict file &&
 622         git checkout to-rebase &&
 623         echo file >file2 &&
 624         git commit -m to-rebase file2 &&
 625         git tag to-rebase-orig &&
 626         git pull --rebase me copy &&
 627         echo "conflicting modification" >expect &&
 628         test_cmp expect file &&
 629         echo file >expect &&
 630         test_cmp expect file2
 631 '
 632
 633 test_expect_success '--rebase -f with rebased upstream' '
 634         test_when_finished "test_might_fail git rebase --abort" &&
 635         git reset --hard to-rebase-orig &&
 636         git pull --rebase -f me copy &&
 637         echo "conflicting modification" >expect &&
 638         test_cmp expect file &&
 639         echo file >expect &&
 640         test_cmp expect file2
 641 '
 642
 643 test_expect_success '--rebase with rebased default upstream' '
 644         git update-ref refs/remotes/me/copy copy-orig &&
 645         git checkout --track -b to-rebase2 me/copy &&
 646         git reset --hard to-rebase-orig &&
 647         git pull --rebase &&
 648         echo "conflicting modification" >expect &&
 649         test_cmp expect file &&
 650         echo file >expect &&
 651         test_cmp expect file2
 652 '
 653
 654 test_expect_success 'rebased upstream + fetch + pull --rebase' '
 655
 656         git update-ref refs/remotes/me/copy copy-orig &&
 657         git reset --hard to-rebase-orig &&
 658         git checkout --track -b to-rebase3 me/copy &&
 659         git reset --hard to-rebase-orig &&
 660         git fetch &&
 661         git pull --rebase &&
 662         echo "conflicting modification" >expect &&
 663         test_cmp expect file &&
 664         echo file >expect &&
 665         test_cmp expect file2
 666
 667 '
 668
 669 test_expect_success 'pull --rebase dies early with dirty working directory' '
 670         git checkout to-rebase &&
 671         git update-ref refs/remotes/me/copy copy^ &&
 672         COPY="$(git rev-parse --verify me/copy)" &&
 673         git rebase --onto $COPY copy &&
 674         test_config branch.to-rebase.remote me &&
 675         test_config branch.to-rebase.merge refs/heads/copy &&
 676         test_config branch.to-rebase.rebase true &&
 677         echo dirty >>file &&
 678         git add file &&
 679         test_must_fail git pull &&
 680         test_cmp_rev "$COPY" me/copy &&
 681         git checkout HEAD -- file &&
 682         git pull &&
 683         test_cmp_rev ! "$COPY" me/copy
 684 '
 685
 686 test_expect_success 'pull --rebase works on branch yet to be born' '
 687         git rev-parse main >expect &&
 688         mkdir empty_repo &&
 689         (
 690                 cd empty_repo &&
 691                 git init &&
 692                 git pull --rebase .. main &&
 693                 git rev-parse HEAD >../actual
 694         ) &&
 695         test_cmp expect actual
 696 '
 697
 698 test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
 699         test_when_finished "rm -rf empty_repo2" &&
 700         git init empty_repo2 &&
 701         (
 702                 cd empty_repo2 &&
 703                 echo staged-file >staged-file &&
 704                 git add staged-file &&
 705                 echo staged-file >expect &&
 706                 git ls-files >actual &&
 707                 test_cmp expect actual &&
 708                 test_must_fail git pull --rebase .. main 2>err &&
 709                 git ls-files >actual &&
 710                 test_cmp expect actual &&
 711                 git show :staged-file >actual &&
 712                 test_cmp expect actual &&
 713                 test_i18ngrep "unborn branch with changes added to the index" err
 714         )
 715 '
 716
 717 test_expect_success 'pull --rebase fails on corrupt HEAD' '
 718         test_when_finished "rm -rf corrupt" &&
 719         git init corrupt &&
 720         (
 721                 cd corrupt &&
 722                 test_commit one &&
 723                 git rev-parse --verify HEAD >head &&
 724                 obj=$(sed "s#^..#&/#" head) &&
 725                 rm -f .git/objects/$obj &&
 726                 test_must_fail git pull --rebase
 727         )
 728 '
 729
 730 test_expect_success 'setup for detecting upstreamed changes' '
 731         test_create_repo src &&
 732         test_commit -C src --printf one stuff "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" &&
 733         git clone src dst &&
 734         (
 735                 cd src &&
 736                 modify s/5/43/ stuff &&
 737                 git commit -a -m "5->43" &&
 738                 modify s/6/42/ stuff &&
 739                 git commit -a -m "Make it bigger"
 740         ) &&
 741         (
 742                 cd dst &&
 743                 modify s/5/43/ stuff &&
 744                 git commit -a -m "Independent discovery of 5->43"
 745         )
 746 '
 747
 748 test_expect_success 'git pull --rebase detects upstreamed changes' '
 749         (
 750                 cd dst &&
 751                 git pull --rebase &&
 752                 git ls-files -u >untracked &&
 753                 test_must_be_empty untracked
 754         )
 755 '
 756
 757 test_expect_success 'setup for avoiding reapplying old patches' '
 758         (
 759                 cd dst &&
 760                 test_might_fail git rebase --abort &&
 761                 git reset --hard origin/main
 762         ) &&
 763         git clone --bare src src-replace.git &&
 764         rm -rf src &&
 765         mv src-replace.git src &&
 766         (
 767                 cd dst &&
 768                 modify s/2/22/ stuff &&
 769                 git commit -a -m "Change 2" &&
 770                 modify s/3/33/ stuff &&
 771                 git commit -a -m "Change 3" &&
 772                 modify s/4/44/ stuff &&
 773                 git commit -a -m "Change 4" &&
 774                 git push &&
 775
 776                 modify s/44/55/ stuff &&
 777                 git commit --amend -a -m "Modified Change 4"
 778         )
 779 '
 780
 781 test_expect_success 'git pull --rebase does not reapply old patches' '
 782         (
 783                 cd dst &&
 784                 test_must_fail git pull --rebase &&
 785                 cat .git/rebase-merge/done .git/rebase-merge/git-rebase-todo >work &&
 786                 grep -v -e \# -e ^$ work >patches &&
 787                 test_line_count = 1 patches &&
 788                 rm -f work
 789         )
 790 '
 791
 792 test_expect_success 'git pull --rebase against local branch' '
 793         git checkout -b copy2 to-rebase-orig &&
 794         git pull --rebase . to-rebase &&
 795         echo "conflicting modification" >expect &&
 796         test_cmp expect file &&
 797         echo file >expect &&
 798         test_cmp expect file2
 799 '
 800
 801 test_done