t/t3030-merge-recursive.sh

   1 #!/bin/sh
   2
   3 test_description='merge-recursive backend test'
   4
   5 . ./test-lib.sh
   6
   7 test_expect_success 'setup 1' '
   8
   9         echo hello >a &&
  10         o0=$(git hash-object a) &&
  11         cp a b &&
  12         cp a c &&
  13         mkdir d &&
  14         cp a d/e &&
  15
  16         test_tick &&
  17         git add a b c d/e &&
  18         git commit -m initial &&
  19         c0=$(git rev-parse --verify HEAD) &&
  20         git branch side &&
  21         git branch df-1 &&
  22         git branch df-2 &&
  23         git branch df-3 &&
  24         git branch remove &&
  25         git branch submod &&
  26         git branch copy &&
  27         git branch rename &&
  28         git branch rename-ln &&
  29
  30         echo hello >>a &&
  31         cp a d/e &&
  32         o1=$(git hash-object a) &&
  33
  34         git add a d/e &&
  35
  36         test_tick &&
  37         git commit -m "master modifies a and d/e" &&
  38         c1=$(git rev-parse --verify HEAD) &&
  39         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
  40         (
  41                 echo "100644 blob $o1   a"
  42                 echo "100644 blob $o0   b"
  43                 echo "100644 blob $o0   c"
  44                 echo "100644 blob $o1   d/e"
  45                 echo "100644 $o1 0      a"
  46                 echo "100644 $o0 0      b"
  47                 echo "100644 $o0 0      c"
  48                 echo "100644 $o1 0      d/e"
  49         ) >expected &&
  50         test_cmp expected actual
  51 '
  52
  53 test_expect_success 'setup 2' '
  54
  55         rm -rf [abcd] &&
  56         git checkout side &&
  57         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
  58         (
  59                 echo "100644 blob $o0   a"
  60                 echo "100644 blob $o0   b"
  61                 echo "100644 blob $o0   c"
  62                 echo "100644 blob $o0   d/e"
  63                 echo "100644 $o0 0      a"
  64                 echo "100644 $o0 0      b"
  65                 echo "100644 $o0 0      c"
  66                 echo "100644 $o0 0      d/e"
  67         ) >expected &&
  68         test_cmp expected actual &&
  69
  70         echo goodbye >>a &&
  71         o2=$(git hash-object a) &&
  72
  73         git add a &&
  74
  75         test_tick &&
  76         git commit -m "side modifies a" &&
  77         c2=$(git rev-parse --verify HEAD) &&
  78         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
  79         (
  80                 echo "100644 blob $o2   a"
  81                 echo "100644 blob $o0   b"
  82                 echo "100644 blob $o0   c"
  83                 echo "100644 blob $o0   d/e"
  84                 echo "100644 $o2 0      a"
  85                 echo "100644 $o0 0      b"
  86                 echo "100644 $o0 0      c"
  87                 echo "100644 $o0 0      d/e"
  88         ) >expected &&
  89         test_cmp expected actual
  90 '
  91
  92 test_expect_success 'setup 3' '
  93
  94         rm -rf [abcd] &&
  95         git checkout df-1 &&
  96         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
  97         (
  98                 echo "100644 blob $o0   a"
  99                 echo "100644 blob $o0   b"
 100                 echo "100644 blob $o0   c"
 101                 echo "100644 blob $o0   d/e"
 102                 echo "100644 $o0 0      a"
 103                 echo "100644 $o0 0      b"
 104                 echo "100644 $o0 0      c"
 105                 echo "100644 $o0 0      d/e"
 106         ) >expected &&
 107         test_cmp expected actual &&
 108
 109         rm -f b && mkdir b && echo df-1 >b/c && git add b/c &&
 110         o3=$(git hash-object b/c) &&
 111
 112         test_tick &&
 113         git commit -m "df-1 makes b/c" &&
 114         c3=$(git rev-parse --verify HEAD) &&
 115         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 116         (
 117                 echo "100644 blob $o0   a"
 118                 echo "100644 blob $o3   b/c"
 119                 echo "100644 blob $o0   c"
 120                 echo "100644 blob $o0   d/e"
 121                 echo "100644 $o0 0      a"
 122                 echo "100644 $o3 0      b/c"
 123                 echo "100644 $o0 0      c"
 124                 echo "100644 $o0 0      d/e"
 125         ) >expected &&
 126         test_cmp expected actual
 127 '
 128
 129 test_expect_success 'setup 4' '
 130
 131         rm -rf [abcd] &&
 132         git checkout df-2 &&
 133         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 134         (
 135                 echo "100644 blob $o0   a"
 136                 echo "100644 blob $o0   b"
 137                 echo "100644 blob $o0   c"
 138                 echo "100644 blob $o0   d/e"
 139                 echo "100644 $o0 0      a"
 140                 echo "100644 $o0 0      b"
 141                 echo "100644 $o0 0      c"
 142                 echo "100644 $o0 0      d/e"
 143         ) >expected &&
 144         test_cmp expected actual &&
 145
 146         rm -f a && mkdir a && echo df-2 >a/c && git add a/c &&
 147         o4=$(git hash-object a/c) &&
 148
 149         test_tick &&
 150         git commit -m "df-2 makes a/c" &&
 151         c4=$(git rev-parse --verify HEAD) &&
 152         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 153         (
 154                 echo "100644 blob $o4   a/c"
 155                 echo "100644 blob $o0   b"
 156                 echo "100644 blob $o0   c"
 157                 echo "100644 blob $o0   d/e"
 158                 echo "100644 $o4 0      a/c"
 159                 echo "100644 $o0 0      b"
 160                 echo "100644 $o0 0      c"
 161                 echo "100644 $o0 0      d/e"
 162         ) >expected &&
 163         test_cmp expected actual
 164 '
 165
 166 test_expect_success 'setup 5' '
 167
 168         rm -rf [abcd] &&
 169         git checkout remove &&
 170         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 171         (
 172                 echo "100644 blob $o0   a"
 173                 echo "100644 blob $o0   b"
 174                 echo "100644 blob $o0   c"
 175                 echo "100644 blob $o0   d/e"
 176                 echo "100644 $o0 0      a"
 177                 echo "100644 $o0 0      b"
 178                 echo "100644 $o0 0      c"
 179                 echo "100644 $o0 0      d/e"
 180         ) >expected &&
 181         test_cmp expected actual &&
 182
 183         rm -f b &&
 184         echo remove-conflict >a &&
 185
 186         git add a &&
 187         git rm b &&
 188         o5=$(git hash-object a) &&
 189
 190         test_tick &&
 191         git commit -m "remove removes b and modifies a" &&
 192         c5=$(git rev-parse --verify HEAD) &&
 193         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 194         (
 195                 echo "100644 blob $o5   a"
 196                 echo "100644 blob $o0   c"
 197                 echo "100644 blob $o0   d/e"
 198                 echo "100644 $o5 0      a"
 199                 echo "100644 $o0 0      c"
 200                 echo "100644 $o0 0      d/e"
 201         ) >expected &&
 202         test_cmp expected actual
 203
 204 '
 205
 206 test_expect_success 'setup 6' '
 207
 208         rm -rf [abcd] &&
 209         git checkout df-3 &&
 210         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 211         (
 212                 echo "100644 blob $o0   a"
 213                 echo "100644 blob $o0   b"
 214                 echo "100644 blob $o0   c"
 215                 echo "100644 blob $o0   d/e"
 216                 echo "100644 $o0 0      a"
 217                 echo "100644 $o0 0      b"
 218                 echo "100644 $o0 0      c"
 219                 echo "100644 $o0 0      d/e"
 220         ) >expected &&
 221         test_cmp expected actual &&
 222
 223         rm -fr d && echo df-3 >d && git add d &&
 224         o6=$(git hash-object d) &&
 225
 226         test_tick &&
 227         git commit -m "df-3 makes d" &&
 228         c6=$(git rev-parse --verify HEAD) &&
 229         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 230         (
 231                 echo "100644 blob $o0   a"
 232                 echo "100644 blob $o0   b"
 233                 echo "100644 blob $o0   c"
 234                 echo "100644 blob $o6   d"
 235                 echo "100644 $o0 0      a"
 236                 echo "100644 $o0 0      b"
 237                 echo "100644 $o0 0      c"
 238                 echo "100644 $o6 0      d"
 239         ) >expected &&
 240         test_cmp expected actual
 241 '
 242
 243 test_expect_success 'setup 7' '
 244
 245         git checkout submod &&
 246         git rm d/e &&
 247         test_tick &&
 248         git commit -m "remove d/e" &&
 249         git update-index --add --cacheinfo 160000 $c1 d &&
 250         test_tick &&
 251         git commit -m "make d/ a submodule"
 252 '
 253
 254 test_expect_success 'setup 8' '
 255         git checkout rename &&
 256         git mv a e &&
 257         git add e &&
 258         test_tick &&
 259         git commit -m "rename a->e" &&
 260         c7=$(git rev-parse --verify HEAD) &&
 261         git checkout rename-ln &&
 262         git mv a e &&
 263         test_ln_s_add e a &&
 264         test_tick &&
 265         git commit -m "rename a->e, symlink a->e" &&
 266         oln=`printf e | git hash-object --stdin`
 267 '
 268
 269 test_expect_success 'setup 9' '
 270         git checkout copy &&
 271         cp a e &&
 272         git add e &&
 273         test_tick &&
 274         git commit -m "copy a->e"
 275 '
 276
 277 test_expect_success 'merge-recursive simple' '
 278
 279         rm -fr [abcd] &&
 280         git checkout -f "$c2" &&
 281
 282         test_expect_code 1 git merge-recursive "$c0" -- "$c2" "$c1"
 283 '
 284
 285 test_expect_success 'merge-recursive result' '
 286
 287         git ls-files -s >actual &&
 288         (
 289                 echo "100644 $o0 1      a"
 290                 echo "100644 $o2 2      a"
 291                 echo "100644 $o1 3      a"
 292                 echo "100644 $o0 0      b"
 293                 echo "100644 $o0 0      c"
 294                 echo "100644 $o1 0      d/e"
 295         ) >expected &&
 296         test_cmp expected actual
 297
 298 '
 299
 300 test_expect_success 'merge-recursive --index-only' '
 301
 302         rm -fr [abcd] &&
 303         git checkout -f "$c2" &&
 304         test_expect_code 1 git merge-recursive --index-only "$c0" -- "$c2" "$c1" &&
 305         git ls-files -s >actual &&
 306         # reuses "expected" from previous test!
 307         test_cmp expected actual &&
 308         git diff HEAD >actual-diff &&
 309         : >expected-diff &&
 310         test_cmp expected-diff actual-diff
 311 '
 312
 313 test_expect_success 'fail if the index has unresolved entries' '
 314
 315         rm -fr [abcd] &&
 316         git checkout -f "$c1" &&
 317
 318         test_must_fail git merge "$c5" &&
 319         test_must_fail git merge "$c5" 2> out &&
 320         test_i18ngrep "not possible because you have unmerged files" out &&
 321         git add -u &&
 322         test_must_fail git merge "$c5" 2> out &&
 323         test_i18ngrep "You have not concluded your merge" out &&
 324         rm -f .git/MERGE_HEAD &&
 325         test_must_fail git merge "$c5" 2> out &&
 326         test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out
 327 '
 328
 329 test_expect_success 'merge-recursive remove conflict' '
 330
 331         rm -fr [abcd] &&
 332         git checkout -f "$c1" &&
 333
 334         test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c5"
 335 '
 336
 337 test_expect_success 'merge-recursive remove conflict' '
 338
 339         git ls-files -s >actual &&
 340         (
 341                 echo "100644 $o0 1      a"
 342                 echo "100644 $o1 2      a"
 343                 echo "100644 $o5 3      a"
 344                 echo "100644 $o0 0      c"
 345                 echo "100644 $o1 0      d/e"
 346         ) >expected &&
 347         test_cmp expected actual
 348
 349 '
 350
 351 test_expect_success 'merge-recursive d/f simple' '
 352         rm -fr [abcd] &&
 353         git reset --hard &&
 354         git checkout -f "$c1" &&
 355
 356         git merge-recursive "$c0" -- "$c1" "$c3"
 357 '
 358
 359 test_expect_success 'merge-recursive result' '
 360
 361         git ls-files -s >actual &&
 362         (
 363                 echo "100644 $o1 0      a"
 364                 echo "100644 $o3 0      b/c"
 365                 echo "100644 $o0 0      c"
 366                 echo "100644 $o1 0      d/e"
 367         ) >expected &&
 368         test_cmp expected actual
 369
 370 '
 371
 372 test_expect_success 'merge-recursive d/f conflict' '
 373
 374         rm -fr [abcd] &&
 375         git reset --hard &&
 376         git checkout -f "$c1" &&
 377
 378         test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c4"
 379 '
 380
 381 test_expect_success 'merge-recursive d/f conflict result' '
 382
 383         git ls-files -s >actual &&
 384         (
 385                 echo "100644 $o0 1      a"
 386                 echo "100644 $o1 2      a"
 387                 echo "100644 $o4 0      a/c"
 388                 echo "100644 $o0 0      b"
 389                 echo "100644 $o0 0      c"
 390                 echo "100644 $o1 0      d/e"
 391         ) >expected &&
 392         test_cmp expected actual
 393
 394 '
 395
 396 test_expect_success 'merge-recursive d/f conflict the other way' '
 397
 398         rm -fr [abcd] &&
 399         git reset --hard &&
 400         git checkout -f "$c4" &&
 401
 402         test_expect_code 1 git merge-recursive "$c0" -- "$c4" "$c1"
 403 '
 404
 405 test_expect_success 'merge-recursive d/f conflict result the other way' '
 406
 407         git ls-files -s >actual &&
 408         (
 409                 echo "100644 $o0 1      a"
 410                 echo "100644 $o1 3      a"
 411                 echo "100644 $o4 0      a/c"
 412                 echo "100644 $o0 0      b"
 413                 echo "100644 $o0 0      c"
 414                 echo "100644 $o1 0      d/e"
 415         ) >expected &&
 416         test_cmp expected actual
 417
 418 '
 419
 420 test_expect_success 'merge-recursive d/f conflict' '
 421
 422         rm -fr [abcd] &&
 423         git reset --hard &&
 424         git checkout -f "$c1" &&
 425
 426         test_expect_code 1 git merge-recursive "$c0" -- "$c1" "$c6"
 427 '
 428
 429 test_expect_success 'merge-recursive d/f conflict result' '
 430
 431         git ls-files -s >actual &&
 432         (
 433                 echo "100644 $o1 0      a"
 434                 echo "100644 $o0 0      b"
 435                 echo "100644 $o0 0      c"
 436                 echo "100644 $o6 3      d"
 437                 echo "100644 $o0 1      d/e"
 438                 echo "100644 $o1 2      d/e"
 439         ) >expected &&
 440         test_cmp expected actual
 441
 442 '
 443
 444 test_expect_success 'merge-recursive d/f conflict' '
 445
 446         rm -fr [abcd] &&
 447         git reset --hard &&
 448         git checkout -f "$c6" &&
 449
 450         test_expect_code 1 git merge-recursive "$c0" -- "$c6" "$c1"
 451 '
 452
 453 test_expect_success 'merge-recursive d/f conflict result' '
 454
 455         git ls-files -s >actual &&
 456         (
 457                 echo "100644 $o1 0      a"
 458                 echo "100644 $o0 0      b"
 459                 echo "100644 $o0 0      c"
 460                 echo "100644 $o6 2      d"
 461                 echo "100644 $o0 1      d/e"
 462                 echo "100644 $o1 3      d/e"
 463         ) >expected &&
 464         test_cmp expected actual
 465
 466 '
 467
 468 test_expect_success 'reset and 3-way merge' '
 469
 470         git reset --hard "$c2" &&
 471         git read-tree -m "$c0" "$c2" "$c1"
 472
 473 '
 474
 475 test_expect_success 'reset and bind merge' '
 476
 477         git reset --hard master &&
 478         git read-tree --prefix=M/ master &&
 479         git ls-files -s >actual &&
 480         (
 481                 echo "100644 $o1 0      M/a"
 482                 echo "100644 $o0 0      M/b"
 483                 echo "100644 $o0 0      M/c"
 484                 echo "100644 $o1 0      M/d/e"
 485                 echo "100644 $o1 0      a"
 486                 echo "100644 $o0 0      b"
 487                 echo "100644 $o0 0      c"
 488                 echo "100644 $o1 0      d/e"
 489         ) >expected &&
 490         test_cmp expected actual &&
 491
 492         git read-tree --prefix=a1/ master &&
 493         git ls-files -s >actual &&
 494         (
 495                 echo "100644 $o1 0      M/a"
 496                 echo "100644 $o0 0      M/b"
 497                 echo "100644 $o0 0      M/c"
 498                 echo "100644 $o1 0      M/d/e"
 499                 echo "100644 $o1 0      a"
 500                 echo "100644 $o1 0      a1/a"
 501                 echo "100644 $o0 0      a1/b"
 502                 echo "100644 $o0 0      a1/c"
 503                 echo "100644 $o1 0      a1/d/e"
 504                 echo "100644 $o0 0      b"
 505                 echo "100644 $o0 0      c"
 506                 echo "100644 $o1 0      d/e"
 507         ) >expected &&
 508         test_cmp expected actual &&
 509
 510         git read-tree --prefix=z/ master &&
 511         git ls-files -s >actual &&
 512         (
 513                 echo "100644 $o1 0      M/a"
 514                 echo "100644 $o0 0      M/b"
 515                 echo "100644 $o0 0      M/c"
 516                 echo "100644 $o1 0      M/d/e"
 517                 echo "100644 $o1 0      a"
 518                 echo "100644 $o1 0      a1/a"
 519                 echo "100644 $o0 0      a1/b"
 520                 echo "100644 $o0 0      a1/c"
 521                 echo "100644 $o1 0      a1/d/e"
 522                 echo "100644 $o0 0      b"
 523                 echo "100644 $o0 0      c"
 524                 echo "100644 $o1 0      d/e"
 525                 echo "100644 $o1 0      z/a"
 526                 echo "100644 $o0 0      z/b"
 527                 echo "100644 $o0 0      z/c"
 528                 echo "100644 $o1 0      z/d/e"
 529         ) >expected &&
 530         test_cmp expected actual
 531
 532 '
 533
 534 test_expect_success 'merge-recursive w/ empty work tree - ours has rename' '
 535         (
 536                 GIT_WORK_TREE="$PWD/ours-has-rename-work" &&
 537                 export GIT_WORK_TREE &&
 538                 GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
 539                 export GIT_INDEX_FILE &&
 540                 mkdir "$GIT_WORK_TREE" &&
 541                 git read-tree -i -m $c7 &&
 542                 git update-index --ignore-missing --refresh &&
 543                 git merge-recursive $c0 -- $c7 $c3 &&
 544                 git ls-files -s >actual-files
 545         ) 2>actual-err &&
 546         >expected-err &&
 547         cat >expected-files <<-EOF &&
 548         100644 $o3 0    b/c
 549         100644 $o0 0    c
 550         100644 $o0 0    d/e
 551         100644 $o0 0    e
 552         EOF
 553         test_cmp expected-files actual-files &&
 554         test_cmp expected-err actual-err
 555 '
 556
 557 test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
 558         (
 559                 GIT_WORK_TREE="$PWD/theirs-has-rename-work" &&
 560                 export GIT_WORK_TREE &&
 561                 GIT_INDEX_FILE="$PWD/theirs-has-rename-index" &&
 562                 export GIT_INDEX_FILE &&
 563                 mkdir "$GIT_WORK_TREE" &&
 564                 git read-tree -i -m $c3 &&
 565                 git update-index --ignore-missing --refresh &&
 566                 git merge-recursive $c0 -- $c3 $c7 &&
 567                 git ls-files -s >actual-files
 568         ) 2>actual-err &&
 569         >expected-err &&
 570         cat >expected-files <<-EOF &&
 571         100644 $o3 0    b/c
 572         100644 $o0 0    c
 573         100644 $o0 0    d/e
 574         100644 $o0 0    e
 575         EOF
 576         test_cmp expected-files actual-files &&
 577         test_cmp expected-err actual-err
 578 '
 579
 580 test_expect_success 'merge removes empty directories' '
 581
 582         git reset --hard master &&
 583         git checkout -b rm &&
 584         git rm d/e &&
 585         git commit -mremoved-d/e &&
 586         git checkout master &&
 587         git merge -s recursive rm &&
 588         test_must_fail test -d d
 589 '
 590
 591 test_expect_failure 'merge-recursive simple w/submodule' '
 592
 593         git checkout submod &&
 594         git merge remove
 595 '
 596
 597 test_expect_failure 'merge-recursive simple w/submodule result' '
 598
 599         git ls-files -s >actual &&
 600         (
 601                 echo "100644 $o5 0      a"
 602                 echo "100644 $o0 0      c"
 603                 echo "160000 $c1 0      d"
 604         ) >expected &&
 605         test_cmp expected actual
 606 '
 607
 608 test_expect_success 'merge-recursive copy vs. rename' '
 609         git checkout -f copy &&
 610         git merge rename &&
 611         ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
 612         (
 613                 echo "100644 blob $o0   b"
 614                 echo "100644 blob $o0   c"
 615                 echo "100644 blob $o0   d/e"
 616                 echo "100644 blob $o0   e"
 617                 echo "100644 $o0 0      b"
 618                 echo "100644 $o0 0      c"
 619                 echo "100644 $o0 0      d/e"
 620                 echo "100644 $o0 0      e"
 621         ) >expected &&
 622         test_cmp expected actual
 623 '
 624
 625 test_expect_failure 'merge-recursive rename vs. rename/symlink' '
 626
 627         git checkout -f rename &&
 628         git merge rename-ln &&
 629         ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
 630         (
 631                 echo "120000 blob $oln  a"
 632                 echo "100644 blob $o0   b"
 633                 echo "100644 blob $o0   c"
 634                 echo "100644 blob $o0   d/e"
 635                 echo "100644 blob $o0   e"
 636                 echo "120000 $oln 0     a"
 637                 echo "100644 $o0 0      b"
 638                 echo "100644 $o0 0      c"
 639                 echo "100644 $o0 0      d/e"
 640                 echo "100644 $o0 0      e"
 641         ) >expected &&
 642         test_cmp expected actual
 643 '
 644
 645
 646 test_done