Andrew's git / gitweb.git / t/t7600-merge.sh
?
t / t7600-merge.shon commit Merge branch 'rp/p4-filetype-change' (c7dd1c5)
   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Lars Hjemli
   4#
   5
   6test_description='git merge
   7
   8Testing basic merge operations/option parsing.
   9
  10! [c0] commit 0
  11 ! [c1] commit 1
  12  ! [c2] commit 2
  13   ! [c3] commit 3
  14    ! [c4] c4
  15     ! [c5] c5
  16      ! [c6] c6
  17       * [master] Merge commit 'c1'
  18--------
  19       - [master] Merge commit 'c1'
  20 +     * [c1] commit 1
  21      +  [c6] c6
  22     +   [c5] c5
  23    ++   [c4] c4
  24   ++++  [c3] commit 3
  25  +      [c2] commit 2
  26+++++++* [c0] commit 0
  27'
  28
  29. ./test-lib.sh
  30. "$TEST_DIRECTORY"/lib-gpg.sh
  31
  32printf '%s\n' 1 2 3 4 5 6 7 8 9 >file
  33printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >file.1
  34printf '%s\n' 1 2 3 4 '5 X' 6 7 8 9 >file.5
  35printf '%s\n' 1 2 3 4 5 6 7 8 '9 X' >file.9
  36printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >result.1
  37printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5
  38printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9
  39>empty
  40
  41create_merge_msgs () {
  42        echo "Merge tag 'c2'" >msg.1-5 &&
  43        echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 &&
  44        {
  45                echo "Squashed commit of the following:" &&
  46                echo &&
  47                git log --no-merges ^HEAD c1
  48        } >squash.1 &&
  49        {
  50                echo "Squashed commit of the following:" &&
  51                echo &&
  52                git log --no-merges ^HEAD c2
  53        } >squash.1-5 &&
  54        {
  55                echo "Squashed commit of the following:" &&
  56                echo &&
  57                git log --no-merges ^HEAD c2 c3
  58        } >squash.1-5-9 &&
  59        : >msg.nologff &&
  60        : >msg.nolognoff &&
  61        {
  62                echo "* tag 'c3':" &&
  63                echo "  commit 3"
  64        } >msg.log
  65}
  66
  67verify_merge () {
  68        test_cmp "$2" "$1" &&
  69        git update-index --refresh &&
  70        git diff --exit-code &&
  71        if test -n "$3"
  72        then
  73                git show -s --pretty=tformat:%s HEAD >msg.act &&
  74                test_cmp "$3" msg.act
  75        fi
  76}
  77
  78verify_head () {
  79        echo "$1" >head.expected &&
  80        git rev-parse HEAD >head.actual &&
  81        test_cmp head.expected head.actual
  82}
  83
  84verify_parents () {
  85        printf '%s\n' "$@" >parents.expected &&
  86        >parents.actual &&
  87        i=1 &&
  88        while test $i -le $#
  89        do
  90                git rev-parse HEAD^$i >>parents.actual &&
  91                i=$(expr $i + 1) ||
  92                return 1
  93        done &&
  94        test_must_fail git rev-parse --verify "HEAD^$i" &&
  95        test_cmp parents.expected parents.actual
  96}
  97
  98verify_mergeheads () {
  99        printf '%s\n' "$@" >mergehead.expected &&
 100        while read sha1 rest
 101        do
 102                git rev-parse $sha1
 103        done <.git/MERGE_HEAD >mergehead.actual &&
 104        test_cmp mergehead.expected mergehead.actual
 105}
 106
 107verify_no_mergehead () {
 108        ! test -e .git/MERGE_HEAD
 109}
 110
 111test_expect_success 'setup' '
 112        git add file &&
 113        test_tick &&
 114        git commit -m "commit 0" &&
 115        git tag c0 &&
 116        c0=$(git rev-parse HEAD) &&
 117        cp file.1 file &&
 118        git add file &&
 119        test_tick &&
 120        git commit -m "commit 1" &&
 121        git tag c1 &&
 122        c1=$(git rev-parse HEAD) &&
 123        git reset --hard "$c0" &&
 124        cp file.5 file &&
 125        git add file &&
 126        test_tick &&
 127        git commit -m "commit 2" &&
 128        git tag c2 &&
 129        c2=$(git rev-parse HEAD) &&
 130        git reset --hard "$c0" &&
 131        cp file.9 file &&
 132        git add file &&
 133        test_tick &&
 134        git commit -m "commit 3" &&
 135        git tag c3 &&
 136        c3=$(git rev-parse HEAD) &&
 137        git reset --hard "$c0" &&
 138        create_merge_msgs
 139'
 140
 141test_debug 'git log --graph --decorate --oneline --all'
 142
 143test_expect_success 'test option parsing' '
 144        test_must_fail git merge -$ c1 &&
 145        test_must_fail git merge --no-such c1 &&
 146        test_must_fail git merge -s foobar c1 &&
 147        test_must_fail git merge -s=foobar c1 &&
 148        test_must_fail git merge -m &&
 149        test_must_fail git merge
 150'
 151
 152test_expect_success 'merge -h with invalid index' '
 153        mkdir broken &&
 154        (
 155                cd broken &&
 156                git init &&
 157                >.git/index &&
 158                test_expect_code 129 git merge -h 2>usage
 159        ) &&
 160        test_i18ngrep "[Uu]sage: git merge" broken/usage
 161'
 162
 163test_expect_success 'reject non-strategy with a git-merge-foo name' '
 164        test_must_fail git merge -s index c1
 165'
 166
 167test_expect_success 'merge c0 with c1' '
 168        echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
 169
 170        git reset --hard c0 &&
 171        git merge c1 &&
 172        verify_merge file result.1 &&
 173        verify_head "$c1" &&
 174
 175        git reflog -1 >reflog.actual &&
 176        sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
 177        test_cmp reflog.expected reflog.fuzzy
 178'
 179
 180test_debug 'git log --graph --decorate --oneline --all'
 181
 182test_expect_success 'merge c0 with c1 with --ff-only' '
 183        git reset --hard c0 &&
 184        git merge --ff-only c1 &&
 185        git merge --ff-only HEAD c0 c1 &&
 186        verify_merge file result.1 &&
 187        verify_head "$c1"
 188'
 189
 190test_debug 'git log --graph --decorate --oneline --all'
 191
 192test_expect_success 'merge from unborn branch' '
 193        git checkout -f master &&
 194        test_might_fail git branch -D kid &&
 195
 196        echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
 197
 198        git checkout --orphan kid &&
 199        test_when_finished "git checkout -f master" &&
 200        git rm -fr . &&
 201        test_tick &&
 202        git merge --ff-only c1 &&
 203        verify_merge file result.1 &&
 204        verify_head "$c1" &&
 205
 206        git reflog -1 >reflog.actual &&
 207        sed "s/$_x05[0-9a-f][0-9a-f]/OBJID/g" reflog.actual >reflog.fuzzy &&
 208        test_cmp reflog.expected reflog.fuzzy
 209'
 210
 211test_debug 'git log --graph --decorate --oneline --all'
 212
 213test_expect_success 'merge c1 with c2' '
 214        git reset --hard c1 &&
 215        test_tick &&
 216        git merge c2 &&
 217        verify_merge file result.1-5 msg.1-5 &&
 218        verify_parents $c1 $c2
 219'
 220
 221test_debug 'git log --graph --decorate --oneline --all'
 222
 223test_expect_success 'merge c1 with c2 and c3' '
 224        git reset --hard c1 &&
 225        test_tick &&
 226        git merge c2 c3 &&
 227        verify_merge file result.1-5-9 msg.1-5-9 &&
 228        verify_parents $c1 $c2 $c3
 229'
 230
 231test_debug 'git log --graph --decorate --oneline --all'
 232
 233test_expect_success 'merges with --ff-only' '
 234        git reset --hard c1 &&
 235        test_tick &&
 236        test_must_fail git merge --ff-only c2 &&
 237        test_must_fail git merge --ff-only c3 &&
 238        test_must_fail git merge --ff-only c2 c3 &&
 239        git reset --hard c0 &&
 240        git merge c3 &&
 241        verify_head $c3
 242'
 243
 244test_expect_success 'merges with merge.ff=only' '
 245        git reset --hard c1 &&
 246        test_tick &&
 247        test_config merge.ff "only" &&
 248        test_must_fail git merge c2 &&
 249        test_must_fail git merge c3 &&
 250        test_must_fail git merge c2 c3 &&
 251        git reset --hard c0 &&
 252        git merge c3 &&
 253        verify_head $c3
 254'
 255
 256test_expect_success 'merge c0 with c1 (no-commit)' '
 257        git reset --hard c0 &&
 258        git merge --no-commit c1 &&
 259        verify_merge file result.1 &&
 260        verify_head $c1
 261'
 262
 263test_debug 'git log --graph --decorate --oneline --all'
 264
 265test_expect_success 'merge c1 with c2 (no-commit)' '
 266        git reset --hard c1 &&
 267        git merge --no-commit c2 &&
 268        verify_merge file result.1-5 &&
 269        verify_head $c1 &&
 270        verify_mergeheads $c2
 271'
 272
 273test_debug 'git log --graph --decorate --oneline --all'
 274
 275test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
 276        git reset --hard c1 &&
 277        git merge --no-commit c2 c3 &&
 278        verify_merge file result.1-5-9 &&
 279        verify_head $c1 &&
 280        verify_mergeheads $c2 $c3
 281'
 282
 283test_debug 'git log --graph --decorate --oneline --all'
 284
 285test_expect_success 'merge c0 with c1 (squash)' '
 286        git reset --hard c0 &&
 287        git merge --squash c1 &&
 288        verify_merge file result.1 &&
 289        verify_head $c0 &&
 290        verify_no_mergehead &&
 291        test_cmp squash.1 .git/SQUASH_MSG
 292'
 293
 294test_debug 'git log --graph --decorate --oneline --all'
 295
 296test_expect_success 'merge c0 with c1 (squash, ff-only)' '
 297        git reset --hard c0 &&
 298        git merge --squash --ff-only c1 &&
 299        verify_merge file result.1 &&
 300        verify_head $c0 &&
 301        verify_no_mergehead &&
 302        test_cmp squash.1 .git/SQUASH_MSG
 303'
 304
 305test_debug 'git log --graph --decorate --oneline --all'
 306
 307test_expect_success 'merge c1 with c2 (squash)' '
 308        git reset --hard c1 &&
 309        git merge --squash c2 &&
 310        verify_merge file result.1-5 &&
 311        verify_head $c1 &&
 312        verify_no_mergehead &&
 313        test_cmp squash.1-5 .git/SQUASH_MSG
 314'
 315
 316test_debug 'git log --graph --decorate --oneline --all'
 317
 318test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '
 319        git reset --hard c1 &&
 320        test_must_fail git merge --squash --ff-only c2
 321'
 322
 323test_debug 'git log --graph --decorate --oneline --all'
 324
 325test_expect_success 'merge c1 with c2 and c3 (squash)' '
 326        git reset --hard c1 &&
 327        git merge --squash c2 c3 &&
 328        verify_merge file result.1-5-9 &&
 329        verify_head $c1 &&
 330        verify_no_mergehead &&
 331        test_cmp squash.1-5-9 .git/SQUASH_MSG
 332'
 333
 334test_debug 'git log --graph --decorate --oneline --all'
 335
 336test_expect_success 'merge c1 with c2 (no-commit in config)' '
 337        git reset --hard c1 &&
 338        test_config branch.master.mergeoptions "--no-commit" &&
 339        git merge c2 &&
 340        verify_merge file result.1-5 &&
 341        verify_head $c1 &&
 342        verify_mergeheads $c2
 343'
 344
 345test_debug 'git log --graph --decorate --oneline --all'
 346
 347test_expect_success 'merge c1 with c2 (log in config)' '
 348        git reset --hard c1 &&
 349        git merge --log c2 &&
 350        git show -s --pretty=tformat:%s%n%b >expect &&
 351
 352        test_config branch.master.mergeoptions "--log" &&
 353        git reset --hard c1 &&
 354        git merge c2 &&
 355        git show -s --pretty=tformat:%s%n%b >actual &&
 356
 357        test_cmp expect actual
 358'
 359
 360test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
 361        git reset --hard c1 &&
 362        git merge c2 &&
 363        git show -s --pretty=tformat:%s%n%b >expect &&
 364
 365        test_config branch.master.mergeoptions "--no-log" &&
 366        test_config merge.log "true" &&
 367        git reset --hard c1 &&
 368        git merge c2 &&
 369        git show -s --pretty=tformat:%s%n%b >actual &&
 370
 371        test_cmp expect actual
 372'
 373
 374test_expect_success 'merge c1 with c2 (squash in config)' '
 375        git reset --hard c1 &&
 376        test_config branch.master.mergeoptions "--squash" &&
 377        git merge c2 &&
 378        verify_merge file result.1-5 &&
 379        verify_head $c1 &&
 380        verify_no_mergehead &&
 381        test_cmp squash.1-5 .git/SQUASH_MSG
 382'
 383
 384test_debug 'git log --graph --decorate --oneline --all'
 385
 386test_expect_success 'override config option -n with --summary' '
 387        git reset --hard c1 &&
 388        test_config branch.master.mergeoptions "-n" &&
 389        test_tick &&
 390        git merge --summary c2 >diffstat.txt &&
 391        verify_merge file result.1-5 msg.1-5 &&
 392        verify_parents $c1 $c2 &&
 393        if ! grep "^ file |  *2 +-$" diffstat.txt
 394        then
 395                echo "[OOPS] diffstat was not generated with --summary"
 396                false
 397        fi
 398'
 399
 400test_expect_success 'override config option -n with --stat' '
 401        git reset --hard c1 &&
 402        test_config branch.master.mergeoptions "-n" &&
 403        test_tick &&
 404        git merge --stat c2 >diffstat.txt &&
 405        verify_merge file result.1-5 msg.1-5 &&
 406        verify_parents $c1 $c2 &&
 407        if ! grep "^ file |  *2 +-$" diffstat.txt
 408        then
 409                echo "[OOPS] diffstat was not generated with --stat"
 410                false
 411        fi
 412'
 413
 414test_debug 'git log --graph --decorate --oneline --all'
 415
 416test_expect_success 'override config option --stat' '
 417        git reset --hard c1 &&
 418        test_config branch.master.mergeoptions "--stat" &&
 419        test_tick &&
 420        git merge -n c2 >diffstat.txt &&
 421        verify_merge file result.1-5 msg.1-5 &&
 422        verify_parents $c1 $c2 &&
 423        if grep "^ file |  *2 +-$" diffstat.txt
 424        then
 425                echo "[OOPS] diffstat was generated"
 426                false
 427        fi
 428'
 429
 430test_debug 'git log --graph --decorate --oneline --all'
 431
 432test_expect_success 'merge c1 with c2 (override --no-commit)' '
 433        git reset --hard c1 &&
 434        test_config branch.master.mergeoptions "--no-commit" &&
 435        test_tick &&
 436        git merge --commit c2 &&
 437        verify_merge file result.1-5 msg.1-5 &&
 438        verify_parents $c1 $c2
 439'
 440
 441test_debug 'git log --graph --decorate --oneline --all'
 442
 443test_expect_success 'merge c1 with c2 (override --squash)' '
 444        git reset --hard c1 &&
 445        test_config branch.master.mergeoptions "--squash" &&
 446        test_tick &&
 447        git merge --no-squash c2 &&
 448        verify_merge file result.1-5 msg.1-5 &&
 449        verify_parents $c1 $c2
 450'
 451
 452test_debug 'git log --graph --decorate --oneline --all'
 453
 454test_expect_success 'merge c0 with c1 (no-ff)' '
 455        git reset --hard c0 &&
 456        test_tick &&
 457        git merge --no-ff c1 &&
 458        verify_merge file result.1 &&
 459        verify_parents $c0 $c1
 460'
 461
 462test_debug 'git log --graph --decorate --oneline --all'
 463
 464test_expect_success 'merge c0 with c1 (merge.ff=false)' '
 465        git reset --hard c0 &&
 466        test_config merge.ff "false" &&
 467        test_tick &&
 468        git merge c1 &&
 469        verify_merge file result.1 &&
 470        verify_parents $c0 $c1
 471'
 472test_debug 'git log --graph --decorate --oneline --all'
 473
 474test_expect_success 'combine branch.master.mergeoptions with merge.ff' '
 475        git reset --hard c0 &&
 476        test_config branch.master.mergeoptions "--ff" &&
 477        test_config merge.ff "false" &&
 478        test_tick &&
 479        git merge c1 &&
 480        verify_merge file result.1 &&
 481        verify_parents "$c0"
 482'
 483
 484test_expect_success 'tolerate unknown values for merge.ff' '
 485        git reset --hard c0 &&
 486        test_config merge.ff "something-new" &&
 487        test_tick &&
 488        git merge c1 2>message &&
 489        verify_head "$c1" &&
 490        test_cmp empty message
 491'
 492
 493test_expect_success 'combining --squash and --no-ff is refused' '
 494        git reset --hard c0 &&
 495        test_must_fail git merge --squash --no-ff c1 &&
 496        test_must_fail git merge --no-ff --squash c1
 497'
 498
 499test_expect_success 'option --ff-only overwrites --no-ff' '
 500        git merge --no-ff --ff-only c1 &&
 501        test_must_fail git merge --no-ff --ff-only c2
 502'
 503
 504test_expect_success 'option --no-ff overrides merge.ff=only config' '
 505        git reset --hard c0 &&
 506        test_config merge.ff only &&
 507        git merge --no-ff c1
 508'
 509
 510test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
 511        git reset --hard c0 &&
 512        test_config branch.master.mergeoptions "--no-ff" &&
 513        git merge --ff c1 &&
 514        verify_merge file result.1 &&
 515        verify_head $c1
 516'
 517
 518test_expect_success 'merge log message' '
 519        git reset --hard c0 &&
 520        git merge --no-log c2 &&
 521        git show -s --pretty=format:%b HEAD >msg.act &&
 522        test_cmp msg.nologff msg.act &&
 523
 524        git reset --hard c0 &&
 525        test_config branch.master.mergeoptions "--no-ff" &&
 526        git merge --no-log c2 &&
 527        git show -s --pretty=format:%b HEAD >msg.act &&
 528        test_cmp msg.nolognoff msg.act &&
 529
 530        git merge --log c3 &&
 531        git show -s --pretty=format:%b HEAD >msg.act &&
 532        test_cmp msg.log msg.act &&
 533
 534        git reset --hard HEAD^ &&
 535        test_config merge.log "yes" &&
 536        git merge c3 &&
 537        git show -s --pretty=format:%b HEAD >msg.act &&
 538        test_cmp msg.log msg.act
 539'
 540
 541test_debug 'git log --graph --decorate --oneline --all'
 542
 543test_expect_success 'merge c1 with c0, c2, c0, and c1' '
 544       git reset --hard c1 &&
 545       test_tick &&
 546       git merge c0 c2 c0 c1 &&
 547       verify_merge file result.1-5 &&
 548       verify_parents $c1 $c2
 549'
 550
 551test_debug 'git log --graph --decorate --oneline --all'
 552
 553test_expect_success 'merge c1 with c0, c2, c0, and c1' '
 554       git reset --hard c1 &&
 555       test_tick &&
 556       git merge c0 c2 c0 c1 &&
 557       verify_merge file result.1-5 &&
 558       verify_parents $c1 $c2
 559'
 560
 561test_debug 'git log --graph --decorate --oneline --all'
 562
 563test_expect_success 'merge c1 with c1 and c2' '
 564       git reset --hard c1 &&
 565       test_tick &&
 566       git merge c1 c2 &&
 567       verify_merge file result.1-5 &&
 568       verify_parents $c1 $c2
 569'
 570
 571test_debug 'git log --graph --decorate --oneline --all'
 572
 573test_expect_success 'merge fast-forward in a dirty tree' '
 574       git reset --hard c0 &&
 575       mv file file1 &&
 576       cat file1 >file &&
 577       rm -f file1 &&
 578       git merge c2
 579'
 580
 581test_debug 'git log --graph --decorate --oneline --all'
 582
 583test_expect_success 'in-index merge' '
 584        git reset --hard c0 &&
 585        git merge --no-ff -s resolve c1 >out &&
 586        test_i18ngrep "Wonderful." out &&
 587        verify_parents $c0 $c1
 588'
 589
 590test_debug 'git log --graph --decorate --oneline --all'
 591
 592test_expect_success 'refresh the index before merging' '
 593        git reset --hard c1 &&
 594        cp file file.n && mv -f file.n file &&
 595        git merge c3
 596'
 597
 598cat >expected.branch <<\EOF
 599Merge branch 'c5-branch' (early part)
 600EOF
 601cat >expected.tag <<\EOF
 602Merge commit 'c5~1'
 603EOF
 604
 605test_expect_success 'merge early part of c2' '
 606        git reset --hard c3 &&
 607        echo c4 >c4.c &&
 608        git add c4.c &&
 609        git commit -m c4 &&
 610        git tag c4 &&
 611        echo c5 >c5.c &&
 612        git add c5.c &&
 613        git commit -m c5 &&
 614        git tag c5 &&
 615        git reset --hard c3 &&
 616        echo c6 >c6.c &&
 617        git add c6.c &&
 618        git commit -m c6 &&
 619        git tag c6 &&
 620        git branch -f c5-branch c5 &&
 621        git merge c5-branch~1 &&
 622        git show -s --pretty=tformat:%s HEAD >actual.branch &&
 623        git reset --keep HEAD^ &&
 624        git merge c5~1 &&
 625        git show -s --pretty=tformat:%s HEAD >actual.tag &&
 626        test_cmp expected.branch actual.branch &&
 627        test_cmp expected.tag actual.tag
 628'
 629
 630test_debug 'git log --graph --decorate --oneline --all'
 631
 632test_expect_success 'merge --no-ff --no-commit && commit' '
 633        git reset --hard c0 &&
 634        git merge --no-ff --no-commit c1 &&
 635        EDITOR=: git commit &&
 636        verify_parents $c0 $c1
 637'
 638
 639test_debug 'git log --graph --decorate --oneline --all'
 640
 641test_expect_success 'amending no-ff merge commit' '
 642        EDITOR=: git commit --amend &&
 643        verify_parents $c0 $c1
 644'
 645
 646test_debug 'git log --graph --decorate --oneline --all'
 647
 648cat >editor <<\EOF
 649#!/bin/sh
 650# Add a new message string that was not in the template
 651(
 652        echo "Merge work done on the side branch c1"
 653        echo
 654        cat <"$1"
 655) >"$1.tmp" && mv "$1.tmp" "$1"
 656# strip comments and blank lines from end of message
 657sed -e '/^#/d' < "$1" | sed -e :a -e '/^\n*$/{$d;N;ba' -e '}' > expected
 658EOF
 659chmod 755 editor
 660
 661test_expect_success 'merge --no-ff --edit' '
 662        git reset --hard c0 &&
 663        EDITOR=./editor git merge --no-ff --edit c1 &&
 664        verify_parents $c0 $c1 &&
 665        git cat-file commit HEAD >raw &&
 666        grep "work done on the side branch" raw &&
 667        sed "1,/^$/d" >actual raw &&
 668        test_cmp actual expected
 669'
 670
 671test_expect_success GPG 'merge --ff-only tag' '
 672        git reset --hard c0 &&
 673        git commit --allow-empty -m "A newer commit" &&
 674        git tag -s -m "A newer commit" signed &&
 675        git reset --hard c0 &&
 676
 677        git merge --ff-only signed &&
 678        git rev-parse signed^0 >expect &&
 679        git rev-parse HEAD >actual &&
 680        test_cmp actual expect
 681'
 682
 683test_expect_success GPG 'merge --no-edit tag should skip editor' '
 684        git reset --hard c0 &&
 685        git commit --allow-empty -m "A newer commit" &&
 686        git tag -f -s -m "A newer commit" signed &&
 687        git reset --hard c0 &&
 688
 689        EDITOR=false git merge --no-edit signed &&
 690        git rev-parse signed^0 >expect &&
 691        git rev-parse HEAD^2 >actual &&
 692        test_cmp actual expect
 693'
 694
 695test_expect_success 'set up mod-256 conflict scenario' '
 696        # 256 near-identical stanzas...
 697        for i in $(test_seq 1 256); do
 698                for j in 1 2 3 4 5; do
 699                        echo $i-$j
 700                done
 701        done >file &&
 702        git add file &&
 703        git commit -m base &&
 704
 705        # one side changes the first line of each to "master"
 706        sed s/-1/-master/ <file >tmp &&
 707        mv tmp file &&
 708        git commit -am master &&
 709
 710        # and the other to "side"; merging the two will
 711        # yield 256 separate conflicts
 712        git checkout -b side HEAD^ &&
 713        sed s/-1/-side/ <file >tmp &&
 714        mv tmp file &&
 715        git commit -am side
 716'
 717
 718test_expect_success 'merge detects mod-256 conflicts (recursive)' '
 719        git reset --hard &&
 720        test_must_fail git merge -s recursive master
 721'
 722
 723test_expect_success 'merge detects mod-256 conflicts (resolve)' '
 724        git reset --hard &&
 725        test_must_fail git merge -s resolve master
 726'
 727
 728test_done