Andrew's git - gitweb.git/blob

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