t/t7600-merge.sh

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