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