Andrew's git / gitweb.git / t/t7600-merge.sh
?
t / t7600-merge.shon commit merge: introduce merge.ff configuration variable (f23e8de)
   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
  31test_expect_success 'set up test data and helpers' '
  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 X" 2 3 4 5 6 7 8 9 >result.1 &&
  37        printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 9 >result.1-5 &&
  38        printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 "9 X" >result.1-5-9 &&
  39
  40        create_merge_msgs() {
  41                echo "Merge commit '\''c2'\''" >msg.1-5 &&
  42                echo "Merge commit '\''c2'\''; commit '\''c3'\''" >msg.1-5-9 &&
  43                {
  44                        echo "Squashed commit of the following:" &&
  45                        echo &&
  46                        git log --no-merges ^HEAD c1
  47                } >squash.1 &&
  48                {
  49                        echo "Squashed commit of the following:" &&
  50                        echo &&
  51                        git log --no-merges ^HEAD c2
  52                } >squash.1-5 &&
  53                {
  54                        echo "Squashed commit of the following:" &&
  55                        echo &&
  56                        git log --no-merges ^HEAD c2 c3
  57                } >squash.1-5-9 &&
  58                echo >msg.nolog &&
  59                {
  60                        echo "* commit '\''c3'\'':" &&
  61                        echo "  commit 3" &&
  62                        echo
  63                } >msg.log
  64        } &&
  65
  66        verify_merge() {
  67                test_cmp "$2" "$1" &&
  68                git update-index --refresh &&
  69                git diff --exit-code &&
  70                if test -n "$3"
  71                then
  72                        git show -s --pretty=format:%s HEAD >msg.act &&
  73                        test_cmp "$3" msg.act
  74                fi
  75        } &&
  76
  77        verify_head() {
  78                echo "$1" >head.expected &&
  79                git rev-parse HEAD >head.actual &&
  80                test_cmp head.expected head.actual
  81        } &&
  82
  83        verify_parents() {
  84                printf "%s\n" "$@" >parents.expected &&
  85                >parents.actual &&
  86                i=1 &&
  87                while test $i -le $#
  88                do
  89                        git rev-parse HEAD^$i >>parents.actual &&
  90                        i=$(expr $i + 1) ||
  91                        return 1
  92                done &&
  93                test_cmp parents.expected parents.actual
  94        } &&
  95
  96        verify_mergeheads() {
  97                printf "%s\n" "$@" >mergehead.expected &&
  98                test_cmp mergehead.expected .git/MERGE_HEAD
  99        } &&
 100
 101        verify_no_mergehead() {
 102                ! test -e .git/MERGE_HEAD
 103        }
 104'
 105
 106test_expect_success 'setup' '
 107        git add file &&
 108        test_tick &&
 109        git commit -m "commit 0" &&
 110        git tag c0 &&
 111        c0=$(git rev-parse HEAD) &&
 112        cp file.1 file &&
 113        git add file &&
 114        test_tick &&
 115        git commit -m "commit 1" &&
 116        git tag c1 &&
 117        c1=$(git rev-parse HEAD) &&
 118        git reset --hard "$c0" &&
 119        cp file.5 file &&
 120        git add file &&
 121        test_tick &&
 122        git commit -m "commit 2" &&
 123        git tag c2 &&
 124        c2=$(git rev-parse HEAD) &&
 125        git reset --hard "$c0" &&
 126        cp file.9 file &&
 127        git add file &&
 128        test_tick &&
 129        git commit -m "commit 3" &&
 130        git tag c3 &&
 131        c3=$(git rev-parse HEAD)
 132        git reset --hard "$c0" &&
 133        create_merge_msgs
 134'
 135
 136test_debug 'git log --graph --decorate --oneline --all'
 137
 138test_expect_success 'test option parsing' '
 139        test_must_fail git merge -$ c1 &&
 140        test_must_fail git merge --no-such c1 &&
 141        test_must_fail git merge -s foobar c1 &&
 142        test_must_fail git merge -s=foobar c1 &&
 143        test_must_fail git merge -m &&
 144        test_must_fail git merge
 145'
 146
 147test_expect_success 'merge -h with invalid index' '
 148        mkdir broken &&
 149        (
 150                cd broken &&
 151                git init &&
 152                >.git/index &&
 153                test_expect_code 129 git merge -h 2>usage
 154        ) &&
 155        grep "[Uu]sage: git merge" broken/usage
 156'
 157
 158test_expect_success 'reject non-strategy with a git-merge-foo name' '
 159        test_must_fail git merge -s index c1
 160'
 161
 162test_expect_success 'merge c0 with c1' '
 163        echo "OBJID HEAD@{0}: merge c1: Fast-forward" >reflog.expected &&
 164
 165        git reset --hard c0 &&
 166        git merge c1 &&
 167        verify_merge file result.1 &&
 168        verify_head "$c1" &&
 169
 170        git reflog -1 >reflog.actual &&
 171        sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
 172        test_cmp reflog.expected reflog.fuzzy
 173'
 174
 175test_debug 'git log --graph --decorate --oneline --all'
 176
 177test_expect_success 'merge c0 with c1 with --ff-only' '
 178        git reset --hard c0 &&
 179        git merge --ff-only c1 &&
 180        git merge --ff-only HEAD c0 c1 &&
 181        verify_merge file result.1 &&
 182        verify_head "$c1"
 183'
 184
 185test_debug 'git log --graph --decorate --oneline --all'
 186
 187test_expect_success 'merge from unborn branch' '
 188        git checkout -f master &&
 189        test_might_fail git branch -D kid &&
 190
 191        echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
 192
 193        git checkout --orphan kid &&
 194        test_when_finished "git checkout -f master" &&
 195        git rm -fr . &&
 196        test_tick &&
 197        git merge --ff-only c1 &&
 198        verify_merge file result.1 &&
 199        verify_head "$c1" &&
 200
 201        git reflog -1 >reflog.actual &&
 202        sed "s/$_x05[0-9a-f][0-9a-f]/OBJID/g" reflog.actual >reflog.fuzzy &&
 203        test_cmp reflog.expected reflog.fuzzy
 204'
 205
 206test_debug 'git log --graph --decorate --oneline --all'
 207
 208test_expect_success 'merge c1 with c2' '
 209        git reset --hard c1 &&
 210        test_tick &&
 211        git merge c2 &&
 212        verify_merge file result.1-5 msg.1-5 &&
 213        verify_parents $c1 $c2
 214'
 215
 216test_debug 'git log --graph --decorate --oneline --all'
 217
 218test_expect_success 'merge c1 with c2 and c3' '
 219        git reset --hard c1 &&
 220        test_tick &&
 221        git merge c2 c3 &&
 222        verify_merge file result.1-5-9 msg.1-5-9 &&
 223        verify_parents $c1 $c2 $c3
 224'
 225
 226test_debug 'git log --graph --decorate --oneline --all'
 227
 228test_expect_success 'merges with --ff-only' '
 229        git reset --hard c1 &&
 230        test_tick &&
 231        test_must_fail git merge --ff-only c2 &&
 232        test_must_fail git merge --ff-only c3 &&
 233        test_must_fail git merge --ff-only c2 c3 &&
 234        git reset --hard c0 &&
 235        git merge c3 &&
 236        verify_head $c3
 237'
 238
 239test_expect_success 'merges with merge.ff=only' '
 240        git reset --hard c1 &&
 241        test_tick &&
 242        test_when_finished "git config --unset merge.ff" &&
 243        git config merge.ff only &&
 244        test_must_fail git merge c2 &&
 245        test_must_fail git merge c3 &&
 246        test_must_fail git merge c2 c3 &&
 247        git reset --hard c0 &&
 248        git merge c3 &&
 249        verify_head $c3
 250'
 251
 252test_expect_success 'merge c0 with c1 (no-commit)' '
 253        git reset --hard c0 &&
 254        git merge --no-commit c1 &&
 255        verify_merge file result.1 &&
 256        verify_head $c1
 257'
 258
 259test_debug 'git log --graph --decorate --oneline --all'
 260
 261test_expect_success 'merge c1 with c2 (no-commit)' '
 262        git reset --hard c1 &&
 263        git merge --no-commit c2 &&
 264        verify_merge file result.1-5 &&
 265        verify_head $c1 &&
 266        verify_mergeheads $c2
 267'
 268
 269test_debug 'git log --graph --decorate --oneline --all'
 270
 271test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
 272        git reset --hard c1 &&
 273        git merge --no-commit c2 c3 &&
 274        verify_merge file result.1-5-9 &&
 275        verify_head $c1 &&
 276        verify_mergeheads $c2 $c3
 277'
 278
 279test_debug 'git log --graph --decorate --oneline --all'
 280
 281test_expect_success 'merge c0 with c1 (squash)' '
 282        git reset --hard c0 &&
 283        git merge --squash c1 &&
 284        verify_merge file result.1 &&
 285        verify_head $c0 &&
 286        verify_no_mergehead &&
 287        test_cmp squash.1 .git/SQUASH_MSG
 288'
 289
 290test_debug 'git log --graph --decorate --oneline --all'
 291
 292test_expect_success 'merge c0 with c1 (squash, ff-only)' '
 293        git reset --hard c0 &&
 294        git merge --squash --ff-only c1 &&
 295        verify_merge file result.1 &&
 296        verify_head $c0 &&
 297        verify_no_mergehead &&
 298        test_cmp squash.1 .git/SQUASH_MSG
 299'
 300
 301test_debug 'git log --graph --decorate --oneline --all'
 302
 303test_expect_success 'merge c1 with c2 (squash)' '
 304        git reset --hard c1 &&
 305        git merge --squash c2 &&
 306        verify_merge file result.1-5 &&
 307        verify_head $c1 &&
 308        verify_no_mergehead &&
 309        test_cmp squash.1-5 .git/SQUASH_MSG
 310'
 311
 312test_debug 'git log --graph --decorate --oneline --all'
 313
 314test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
 315        git reset --hard c1 &&
 316        test_must_fail git merge --squash --ff-only c2
 317'
 318
 319test_debug 'git log --graph --decorate --oneline --all'
 320
 321test_expect_success 'merge c1 with c2 and c3 (squash)' '
 322        git reset --hard c1 &&
 323        git merge --squash c2 c3 &&
 324        verify_merge file result.1-5-9 &&
 325        verify_head $c1 &&
 326        verify_no_mergehead &&
 327        test_cmp squash.1-5-9 .git/SQUASH_MSG
 328'
 329
 330test_debug 'git log --graph --decorate --oneline --all'
 331
 332test_expect_success 'merge c1 with c2 (no-commit in config)' '
 333        git reset --hard c1 &&
 334        git config branch.master.mergeoptions "--no-commit" &&
 335        git merge c2 &&
 336        verify_merge file result.1-5 &&
 337        verify_head $c1 &&
 338        verify_mergeheads $c2
 339'
 340
 341test_debug 'git log --graph --decorate --oneline --all'
 342
 343test_expect_success 'merge c1 with c2 (log in config)' '
 344        git config branch.master.mergeoptions "" &&
 345        git reset --hard c1 &&
 346        git merge --log c2 &&
 347        git show -s --pretty=tformat:%s%n%b >expect &&
 348
 349        git config branch.master.mergeoptions --log &&
 350        git reset --hard c1 &&
 351        git merge c2 &&
 352        git show -s --pretty=tformat:%s%n%b >actual &&
 353
 354        test_cmp expect actual
 355'
 356
 357test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
 358        test_when_finished "git config --remove-section branch.master" &&
 359        test_when_finished "git config --remove-section merge" &&
 360        test_might_fail git config --remove-section branch.master &&
 361        test_might_fail git config --remove-section merge &&
 362
 363        git reset --hard c1 &&
 364        git merge c2 &&
 365        git show -s --pretty=tformat:%s%n%b >expect &&
 366
 367        git config branch.master.mergeoptions "--no-log" &&
 368        git config merge.log true &&
 369        git reset --hard c1 &&
 370        git merge c2 &&
 371        git show -s --pretty=tformat:%s%n%b >actual &&
 372
 373        test_cmp expect actual
 374'
 375
 376test_expect_success 'merge c1 with c2 (squash in config)' '
 377        git reset --hard c1 &&
 378        git config branch.master.mergeoptions "--squash" &&
 379        git merge c2 &&
 380        verify_merge file result.1-5 &&
 381        verify_head $c1 &&
 382        verify_no_mergehead &&
 383        test_cmp squash.1-5 .git/SQUASH_MSG
 384'
 385
 386test_debug 'git log --graph --decorate --oneline --all'
 387
 388test_expect_success 'override config option -n with --summary' '
 389        git reset --hard c1 &&
 390        git config branch.master.mergeoptions "-n" &&
 391        test_tick &&
 392        git merge --summary c2 >diffstat.txt &&
 393        verify_merge file result.1-5 msg.1-5 &&
 394        verify_parents $c1 $c2 &&
 395        if ! grep "^ file |  *2 +-$" diffstat.txt
 396        then
 397                echo "[OOPS] diffstat was not generated with --summary"
 398                false
 399        fi
 400'
 401
 402test_expect_success 'override config option -n with --stat' '
 403        git reset --hard c1 &&
 404        git config branch.master.mergeoptions "-n" &&
 405        test_tick &&
 406        git merge --stat c2 >diffstat.txt &&
 407        verify_merge file result.1-5 msg.1-5 &&
 408        verify_parents $c1 $c2 &&
 409        if ! grep "^ file |  *2 +-$" diffstat.txt
 410        then
 411                echo "[OOPS] diffstat was not generated with --stat"
 412                false
 413        fi
 414'
 415
 416test_debug 'git log --graph --decorate --oneline --all'
 417
 418test_expect_success 'override config option --stat' '
 419        git reset --hard c1 &&
 420        git config branch.master.mergeoptions "--stat" &&
 421        test_tick &&
 422        git merge -n c2 >diffstat.txt &&
 423        verify_merge file result.1-5 msg.1-5 &&
 424        verify_parents $c1 $c2 &&
 425        if grep "^ file |  *2 +-$" diffstat.txt
 426        then
 427                echo "[OOPS] diffstat was generated"
 428                false
 429        fi
 430'
 431
 432test_debug 'git log --graph --decorate --oneline --all'
 433
 434test_expect_success 'merge c1 with c2 (override --no-commit)' '
 435        git reset --hard c1 &&
 436        git config branch.master.mergeoptions "--no-commit" &&
 437        test_tick &&
 438        git merge --commit c2 &&
 439        verify_merge file result.1-5 msg.1-5 &&
 440        verify_parents $c1 $c2
 441'
 442
 443test_debug 'git log --graph --decorate --oneline --all'
 444
 445test_expect_success 'merge c1 with c2 (override --squash)' '
 446        git reset --hard c1 &&
 447        git config branch.master.mergeoptions "--squash" &&
 448        test_tick &&
 449        git merge --no-squash c2 &&
 450        verify_merge file result.1-5 msg.1-5 &&
 451        verify_parents $c1 $c2
 452'
 453
 454test_debug 'git log --graph --decorate --oneline --all'
 455
 456test_expect_success 'merge c0 with c1 (no-ff)' '
 457        git reset --hard c0 &&
 458        git config branch.master.mergeoptions "" &&
 459        test_tick &&
 460        git merge --no-ff c1 &&
 461        verify_merge file result.1 &&
 462        verify_parents $c0 $c1
 463'
 464
 465test_debug 'git log --graph --decorate --oneline --all'
 466
 467test_expect_success 'merge c0 with c1 (merge.ff=false)' '
 468        git reset --hard c0 &&
 469        git config merge.ff false &&
 470        test_tick &&
 471        git merge c1 &&
 472        git config --remove-section merge &&
 473        verify_merge file result.1 &&
 474        verify_parents $c0 $c1
 475'
 476test_debug 'git log --graph --decorate --oneline --all'
 477
 478test_expect_success 'combine branch.master.mergeoptions with merge.ff' '
 479        git reset --hard c0 &&
 480        git config branch.master.mergeoptions --ff
 481        git config merge.ff false
 482        test_tick &&
 483        git merge c1 &&
 484        git config --remove-section "branch.master" &&
 485        git config --remove-section "merge" &&
 486        verify_merge file result.1 &&
 487        verify_parents "$c0"
 488'
 489
 490test_expect_success 'combining --squash and --no-ff is refused' '
 491        test_must_fail git merge --squash --no-ff c1 &&
 492        test_must_fail git merge --no-ff --squash c1
 493'
 494
 495test_expect_success 'combining --ff-only and --no-ff is refused' '
 496        test_must_fail git merge --ff-only --no-ff c1 &&
 497        test_must_fail git merge --no-ff --ff-only c1
 498'
 499
 500test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
 501        git reset --hard c0 &&
 502        git config branch.master.mergeoptions "--no-ff" &&
 503        git merge --ff c1 &&
 504        verify_merge file result.1 &&
 505        verify_head $c1
 506'
 507
 508test_expect_success 'merge log message' '
 509        git reset --hard c0 &&
 510        git merge --no-log c2 &&
 511        git show -s --pretty=format:%b HEAD >msg.act &&
 512        test_cmp msg.nolog msg.act &&
 513
 514        git merge --log c3 &&
 515        git show -s --pretty=format:%b HEAD >msg.act &&
 516        test_cmp msg.log msg.act &&
 517
 518        git reset --hard HEAD^ &&
 519        git config merge.log yes &&
 520        git merge c3 &&
 521        git show -s --pretty=format:%b HEAD >msg.act &&
 522        test_cmp msg.log msg.act
 523'
 524
 525test_debug 'git log --graph --decorate --oneline --all'
 526
 527test_expect_success 'merge c1 with c0, c2, c0, and c1' '
 528       git reset --hard c1 &&
 529       git config branch.master.mergeoptions "" &&
 530       test_tick &&
 531       git merge c0 c2 c0 c1 &&
 532       verify_merge file result.1-5 &&
 533       verify_parents $c1 $c2
 534'
 535
 536test_debug 'git log --graph --decorate --oneline --all'
 537
 538test_expect_success 'merge c1 with c0, c2, c0, and c1' '
 539       git reset --hard c1 &&
 540       git config branch.master.mergeoptions "" &&
 541       test_tick &&
 542       git merge c0 c2 c0 c1 &&
 543       verify_merge file result.1-5 &&
 544       verify_parents $c1 $c2
 545'
 546
 547test_debug 'git log --graph --decorate --oneline --all'
 548
 549test_expect_success 'merge c1 with c1 and c2' '
 550       git reset --hard c1 &&
 551       git config branch.master.mergeoptions "" &&
 552       test_tick &&
 553       git merge c1 c2 &&
 554       verify_merge file result.1-5 &&
 555       verify_parents $c1 $c2
 556'
 557
 558test_debug 'git log --graph --decorate --oneline --all'
 559
 560test_expect_success 'merge fast-forward in a dirty tree' '
 561       git reset --hard c0 &&
 562       mv file file1 &&
 563       cat file1 >file &&
 564       rm -f file1 &&
 565       git merge c2
 566'
 567
 568test_debug 'git log --graph --decorate --oneline --all'
 569
 570test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
 571        git reset --hard c0 &&
 572        git merge --no-ff -s resolve c1 >out &&
 573        grep "Wonderful." out &&
 574        verify_parents $c0 $c1
 575'
 576
 577test_debug 'git log --graph --decorate --oneline --all'
 578
 579test_expect_success 'refresh the index before merging' '
 580        git reset --hard c1 &&
 581        cp file file.n && mv -f file.n file &&
 582        git merge c3
 583'
 584
 585cat >expected.branch <<\EOF
 586Merge branch 'c5-branch' (early part)
 587EOF
 588cat >expected.tag <<\EOF
 589Merge commit 'c5~1'
 590EOF
 591
 592test_expect_success 'merge early part of c2' '
 593        git reset --hard c3 &&
 594        echo c4 >c4.c &&
 595        git add c4.c &&
 596        git commit -m c4 &&
 597        git tag c4 &&
 598        echo c5 >c5.c &&
 599        git add c5.c &&
 600        git commit -m c5 &&
 601        git tag c5 &&
 602        git reset --hard c3 &&
 603        echo c6 >c6.c &&
 604        git add c6.c &&
 605        git commit -m c6 &&
 606        git tag c6 &&
 607        git branch -f c5-branch c5 &&
 608        git merge c5-branch~1 &&
 609        git show -s --pretty=format:%s HEAD >actual.branch &&
 610        git reset --keep HEAD^ &&
 611        git merge c5~1 &&
 612        git show -s --pretty=format:%s HEAD >actual.tag &&
 613        test_cmp expected.branch actual.branch &&
 614        test_cmp expected.tag actual.tag
 615'
 616
 617test_debug 'git log --graph --decorate --oneline --all'
 618
 619test_expect_success 'merge --no-ff --no-commit && commit' '
 620        git reset --hard c0 &&
 621        git merge --no-ff --no-commit c1 &&
 622        EDITOR=: git commit &&
 623        verify_parents $c0 $c1
 624'
 625
 626test_debug 'git log --graph --decorate --oneline --all'
 627
 628test_expect_success 'amending no-ff merge commit' '
 629        EDITOR=: git commit --amend &&
 630        verify_parents $c0 $c1
 631'
 632
 633test_debug 'git log --graph --decorate --oneline --all'
 634
 635test_done