t/t5520-pull.sh

   1 #!/bin/sh
   2
   3 test_description='pulling into void'
   4
   5 . ./test-lib.sh
   6
   7 modify () {
   8         sed -e "$1" <"$2" >"$2.x" &&
   9         mv "$2.x" "$2"
  10 }
  11
  12 test_expect_success setup '
  13         echo file >file &&
  14         git add file &&
  15         git commit -a -m original
  16 '
  17
  18 test_expect_success 'pulling into void' '
  19         git init cloned &&
  20         (
  21                 cd cloned &&
  22                 git pull ..
  23         ) &&
  24         test -f file &&
  25         test -f cloned/file &&
  26         test_cmp file cloned/file
  27 '
  28
  29 test_expect_success 'pulling into void using master:master' '
  30         git init cloned-uho &&
  31         (
  32                 cd cloned-uho &&
  33                 git pull .. master:master
  34         ) &&
  35         test -f file &&
  36         test -f cloned-uho/file &&
  37         test_cmp file cloned-uho/file
  38 '
  39
  40 test_expect_success 'pulling into void does not overwrite untracked files' '
  41         git init cloned-untracked &&
  42         (
  43                 cd cloned-untracked &&
  44                 echo untracked >file &&
  45                 test_must_fail git pull .. master &&
  46                 echo untracked >expect &&
  47                 test_cmp expect file
  48         )
  49 '
  50
  51 test_expect_success 'pulling into void does not overwrite staged files' '
  52         git init cloned-staged-colliding &&
  53         (
  54                 cd cloned-staged-colliding &&
  55                 echo "alternate content" >file &&
  56                 git add 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
  62         )
  63 '
  64
  65 test_expect_success 'pulling into void does not remove new staged files' '
  66         git init cloned-staged-new &&
  67         (
  68                 cd cloned-staged-new &&
  69                 echo "new tracked file" >newfile &&
  70                 git add newfile &&
  71                 git pull .. master &&
  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
  76         )
  77 '
  78
  79 test_expect_success 'pulling into void must not create an octopus' '
  80         git init cloned-octopus &&
  81         (
  82                 cd cloned-octopus &&
  83                 test_must_fail git pull .. master master &&
  84                 ! test -f file
  85         )
  86 '
  87
  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 &&
  92         echo updated >file &&
  93         git commit -a -m updated &&
  94         git checkout copy &&
  95         test "$(cat file)" = file &&
  96         git pull &&
  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
 102 '
 103
 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 &&
 108         git checkout copy &&
 109         git reset --hard HEAD^ &&
 110         test "$(cat file)" = file &&
 111         git pull . second &&
 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
 117 '
 118
 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
 126 '
 127
 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
 138 '
 139
 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
 149 '
 150
 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
 161 '
 162
 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
 173 '
 174
 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
 184 '
 185
 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)" &&
 194         cp file expected &&
 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 &&
 198         git add 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
 203 '
 204
 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)"
 213 '
 214
 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)"
 224 '
 225
 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 &&
 231         echo new > file2 &&
 232         git add file2 &&
 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)"
 238 '
 239
 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)"
 246 '
 247
 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 &&
 252         git add 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"
 257 '
 258
 259 test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
 260         test_config rebase.autostash true &&
 261         git reset --hard before-rebase &&
 262         echo dirty >new_file &&
 263         git add new_file &&
 264         git pull --rebase --autostash . copy &&
 265         test_cmp_rev HEAD^ copy &&
 266         test "$(cat new_file)" = dirty &&
 267         test "$(cat file)" = "modified again"
 268 '
 269
 270 test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
 271         test_config rebase.autostash false &&
 272         git reset --hard before-rebase &&
 273         echo dirty >new_file &&
 274         git add new_file &&
 275         git pull --rebase --autostash . copy &&
 276         test_cmp_rev HEAD^ copy &&
 277         test "$(cat new_file)" = dirty &&
 278         test "$(cat file)" = "modified again"
 279 '
 280
 281 test_expect_success 'pull --rebase: --autostash & rebase.autostash unset' '
 282         test_unconfig rebase.autostash &&
 283         git reset --hard before-rebase &&
 284         echo dirty >new_file &&
 285         git add new_file &&
 286         git pull --rebase --autostash . copy &&
 287         test_cmp_rev HEAD^ copy &&
 288         test "$(cat new_file)" = dirty &&
 289         test "$(cat file)" = "modified again"
 290 '
 291
 292 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
 293         test_config rebase.autostash true &&
 294         git reset --hard before-rebase &&
 295         echo dirty >new_file &&
 296         git add new_file &&
 297         test_must_fail git pull --rebase --no-autostash . copy 2>err &&
 298         test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
 299 '
 300
 301 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
 302         test_config rebase.autostash false &&
 303         git reset --hard before-rebase &&
 304         echo dirty >new_file &&
 305         git add new_file &&
 306         test_must_fail git pull --rebase --no-autostash . copy 2>err &&
 307         test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
 308 '
 309
 310 test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
 311         test_unconfig rebase.autostash &&
 312         git reset --hard before-rebase &&
 313         echo dirty >new_file &&
 314         git add new_file &&
 315         test_must_fail git pull --rebase --no-autostash . copy 2>err &&
 316         test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
 317 '
 318
 319 test_expect_success 'pull --autostash (without --rebase) should error out' '
 320         test_must_fail git pull --autostash . copy 2>actual &&
 321         echo "fatal: --[no-]autostash option is only valid with --rebase." >expect &&
 322         test_i18ncmp actual expect
 323 '
 324
 325 test_expect_success 'pull --no-autostash (without --rebase) should error out' '
 326         test_must_fail git pull --no-autostash . copy 2>actual &&
 327         echo "fatal: --[no-]autostash option is only valid with --rebase." >expect &&
 328         test_i18ncmp actual expect
 329 '
 330
 331 test_expect_success 'pull.rebase' '
 332         git reset --hard before-rebase &&
 333         test_config pull.rebase true &&
 334         git pull . copy &&
 335         test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
 336         test new = "$(git show HEAD:file2)"
 337 '
 338
 339 test_expect_success 'branch.to-rebase.rebase' '
 340         git reset --hard before-rebase &&
 341         test_config branch.to-rebase.rebase true &&
 342         git pull . copy &&
 343         test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
 344         test new = "$(git show HEAD:file2)"
 345 '
 346
 347 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
 348         git reset --hard before-rebase &&
 349         test_config pull.rebase true &&
 350         test_config branch.to-rebase.rebase false &&
 351         git pull . copy &&
 352         test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
 353         test new = "$(git show HEAD:file2)"
 354 '
 355
 356 # add a feature branch, keep-merge, that is merged into master, so the
 357 # test can try preserving the merge commit (or not) with various
 358 # --rebase flags/pull.rebase settings.
 359 test_expect_success 'preserve merge setup' '
 360         git reset --hard before-rebase &&
 361         git checkout -b keep-merge second^ &&
 362         test_commit file3 &&
 363         git checkout to-rebase &&
 364         git merge keep-merge &&
 365         git tag before-preserve-rebase
 366 '
 367
 368 test_expect_success 'pull.rebase=false create a new merge commit' '
 369         git reset --hard before-preserve-rebase &&
 370         test_config pull.rebase false &&
 371         git pull . copy &&
 372         test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
 373         test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
 374         test file3 = "$(git show HEAD:file3.t)"
 375 '
 376
 377 test_expect_success 'pull.rebase=true flattens keep-merge' '
 378         git reset --hard before-preserve-rebase &&
 379         test_config pull.rebase true &&
 380         git pull . copy &&
 381         test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 382         test file3 = "$(git show HEAD:file3.t)"
 383 '
 384
 385 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
 386         git reset --hard before-preserve-rebase &&
 387         test_config pull.rebase 1 &&
 388         git pull . copy &&
 389         test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 390         test file3 = "$(git show HEAD:file3.t)"
 391 '
 392
 393 test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' '
 394         git reset --hard before-preserve-rebase &&
 395         test_config pull.rebase preserve &&
 396         git pull . copy &&
 397         test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 398         test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
 399 '
 400
 401 test_expect_success 'pull.rebase=interactive' '
 402         write_script "$TRASH_DIRECTORY/fake-editor" <<-\EOF &&
 403         echo I was here >fake.out &&
 404         false
 405         EOF
 406         test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
 407         test_must_fail git pull --rebase=interactive . copy &&
 408         test "I was here" = "$(cat fake.out)"
 409 '
 410
 411 test_expect_success 'pull.rebase=invalid fails' '
 412         git reset --hard before-preserve-rebase &&
 413         test_config pull.rebase invalid &&
 414         ! git pull . copy
 415 '
 416
 417 test_expect_success '--rebase=false create a new merge commit' '
 418         git reset --hard before-preserve-rebase &&
 419         test_config pull.rebase true &&
 420         git pull --rebase=false . copy &&
 421         test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
 422         test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
 423         test file3 = "$(git show HEAD:file3.t)"
 424 '
 425
 426 test_expect_success '--rebase=true rebases and flattens keep-merge' '
 427         git reset --hard before-preserve-rebase &&
 428         test_config pull.rebase preserve &&
 429         git pull --rebase=true . copy &&
 430         test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 431         test file3 = "$(git show HEAD:file3.t)"
 432 '
 433
 434 test_expect_success '--rebase=preserve rebases and merges keep-merge' '
 435         git reset --hard before-preserve-rebase &&
 436         test_config pull.rebase true &&
 437         git pull --rebase=preserve . copy &&
 438         test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 439         test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
 440 '
 441
 442 test_expect_success '--rebase=invalid fails' '
 443         git reset --hard before-preserve-rebase &&
 444         ! git pull --rebase=invalid . copy
 445 '
 446
 447 test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
 448         git reset --hard before-preserve-rebase &&
 449         test_config pull.rebase preserve &&
 450         git pull --rebase . copy &&
 451         test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 452         test file3 = "$(git show HEAD:file3.t)"
 453 '
 454
 455 test_expect_success '--rebase with rebased upstream' '
 456
 457         git remote add -f me . &&
 458         git checkout copy &&
 459         git tag copy-orig &&
 460         git reset --hard HEAD^ &&
 461         echo conflicting modification > file &&
 462         git commit -m conflict file &&
 463         git checkout to-rebase &&
 464         echo file > file2 &&
 465         git commit -m to-rebase file2 &&
 466         git tag to-rebase-orig &&
 467         git pull --rebase me copy &&
 468         test "conflicting modification" = "$(cat file)" &&
 469         test file = "$(cat file2)"
 470
 471 '
 472
 473 test_expect_success '--rebase -f with rebased upstream' '
 474         test_when_finished "test_might_fail git rebase --abort" &&
 475         git reset --hard to-rebase-orig &&
 476         git pull --rebase -f me copy &&
 477         test "conflicting modification" = "$(cat file)" &&
 478         test file = "$(cat file2)"
 479 '
 480
 481 test_expect_success '--rebase with rebased default upstream' '
 482
 483         git update-ref refs/remotes/me/copy copy-orig &&
 484         git checkout --track -b to-rebase2 me/copy &&
 485         git reset --hard to-rebase-orig &&
 486         git pull --rebase &&
 487         test "conflicting modification" = "$(cat file)" &&
 488         test file = "$(cat file2)"
 489
 490 '
 491
 492 test_expect_success 'rebased upstream + fetch + pull --rebase' '
 493
 494         git update-ref refs/remotes/me/copy copy-orig &&
 495         git reset --hard to-rebase-orig &&
 496         git checkout --track -b to-rebase3 me/copy &&
 497         git reset --hard to-rebase-orig &&
 498         git fetch &&
 499         git pull --rebase &&
 500         test "conflicting modification" = "$(cat file)" &&
 501         test file = "$(cat file2)"
 502
 503 '
 504
 505 test_expect_success 'pull --rebase dies early with dirty working directory' '
 506
 507         git checkout to-rebase &&
 508         git update-ref refs/remotes/me/copy copy^ &&
 509         COPY="$(git rev-parse --verify me/copy)" &&
 510         git rebase --onto $COPY copy &&
 511         test_config branch.to-rebase.remote me &&
 512         test_config branch.to-rebase.merge refs/heads/copy &&
 513         test_config branch.to-rebase.rebase true &&
 514         echo dirty >> file &&
 515         git add file &&
 516         test_must_fail git pull &&
 517         test "$COPY" = "$(git rev-parse --verify me/copy)" &&
 518         git checkout HEAD -- file &&
 519         git pull &&
 520         test "$COPY" != "$(git rev-parse --verify me/copy)"
 521
 522 '
 523
 524 test_expect_success 'pull --rebase works on branch yet to be born' '
 525         git rev-parse master >expect &&
 526         mkdir empty_repo &&
 527         (cd empty_repo &&
 528          git init &&
 529          git pull --rebase .. master &&
 530          git rev-parse HEAD >../actual
 531         ) &&
 532         test_cmp expect actual
 533 '
 534
 535 test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
 536         test_when_finished "rm -rf empty_repo2" &&
 537         git init empty_repo2 &&
 538         (
 539                 cd empty_repo2 &&
 540                 echo staged-file >staged-file &&
 541                 git add staged-file &&
 542                 test "$(git ls-files)" = staged-file &&
 543                 test_must_fail git pull --rebase .. master 2>err &&
 544                 test "$(git ls-files)" = staged-file &&
 545                 test "$(git show :staged-file)" = staged-file &&
 546                 test_i18ngrep "unborn branch with changes added to the index" err
 547         )
 548 '
 549
 550 test_expect_success 'setup for detecting upstreamed changes' '
 551         mkdir src &&
 552         (cd src &&
 553          git init &&
 554          printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
 555          git add stuff &&
 556          git commit -m "Initial revision"
 557         ) &&
 558         git clone src dst &&
 559         (cd src &&
 560          modify s/5/43/ stuff &&
 561          git commit -a -m "5->43" &&
 562          modify s/6/42/ stuff &&
 563          git commit -a -m "Make it bigger"
 564         ) &&
 565         (cd dst &&
 566          modify s/5/43/ stuff &&
 567          git commit -a -m "Independent discovery of 5->43"
 568         )
 569 '
 570
 571 test_expect_success 'git pull --rebase detects upstreamed changes' '
 572         (cd dst &&
 573          git pull --rebase &&
 574          test -z "$(git ls-files -u)"
 575         )
 576 '
 577
 578 test_expect_success 'setup for avoiding reapplying old patches' '
 579         (cd dst &&
 580          test_might_fail git rebase --abort &&
 581          git reset --hard origin/master
 582         ) &&
 583         git clone --bare src src-replace.git &&
 584         rm -rf src &&
 585         mv src-replace.git src &&
 586         (cd dst &&
 587          modify s/2/22/ stuff &&
 588          git commit -a -m "Change 2" &&
 589          modify s/3/33/ stuff &&
 590          git commit -a -m "Change 3" &&
 591          modify s/4/44/ stuff &&
 592          git commit -a -m "Change 4" &&
 593          git push &&
 594
 595          modify s/44/55/ stuff &&
 596          git commit --amend -a -m "Modified Change 4"
 597         )
 598 '
 599
 600 test_expect_success 'git pull --rebase does not reapply old patches' '
 601         (cd dst &&
 602          test_must_fail git pull --rebase &&
 603          test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
 604         )
 605 '
 606
 607 test_expect_success 'git pull --rebase against local branch' '
 608         git checkout -b copy2 to-rebase-orig &&
 609         git pull --rebase . to-rebase &&
 610         test "conflicting modification" = "$(cat file)" &&
 611         test file = "$(cat file2)"
 612 '
 613
 614 test_done