Andrew's git / gitweb.git / t/t7600-merge.sh
?
t / t7600-merge.shon commit git-svn: Fix git svn log --show-commit (9963e02)
   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 'failing 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'
 235
 236test_expect_success 'merge c0 with c1 (no-commit)' '
 237        git reset --hard c0 &&
 238        git merge --no-commit c1 &&
 239        verify_merge file result.1 &&
 240        verify_head $c1
 241'
 242
 243test_debug 'git log --graph --decorate --oneline --all'
 244
 245test_expect_success 'merge c1 with c2 (no-commit)' '
 246        git reset --hard c1 &&
 247        git merge --no-commit c2 &&
 248        verify_merge file result.1-5 &&
 249        verify_head $c1 &&
 250        verify_mergeheads $c2
 251'
 252
 253test_debug 'git log --graph --decorate --oneline --all'
 254
 255test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
 256        git reset --hard c1 &&
 257        git merge --no-commit c2 c3 &&
 258        verify_merge file result.1-5-9 &&
 259        verify_head $c1 &&
 260        verify_mergeheads $c2 $c3
 261'
 262
 263test_debug 'git log --graph --decorate --oneline --all'
 264
 265test_expect_success 'merge c0 with c1 (squash)' '
 266        git reset --hard c0 &&
 267        git merge --squash c1 &&
 268        verify_merge file result.1 &&
 269        verify_head $c0 &&
 270        verify_no_mergehead &&
 271        test_cmp squash.1 .git/SQUASH_MSG
 272'
 273
 274test_debug 'git log --graph --decorate --oneline --all'
 275
 276test_expect_success 'merge c0 with c1 (squash, ff-only)' '
 277        git reset --hard c0 &&
 278        git merge --squash --ff-only c1 &&
 279        verify_merge file result.1 &&
 280        verify_head $c0 &&
 281        verify_no_mergehead &&
 282        test_cmp squash.1 .git/SQUASH_MSG
 283'
 284
 285test_debug 'git log --graph --decorate --oneline --all'
 286
 287test_expect_success 'merge c1 with c2 (squash)' '
 288        git reset --hard c1 &&
 289        git merge --squash c2 &&
 290        verify_merge file result.1-5 &&
 291        verify_head $c1 &&
 292        verify_no_mergehead &&
 293        test_cmp squash.1-5 .git/SQUASH_MSG
 294'
 295
 296test_debug 'git log --graph --decorate --oneline --all'
 297
 298test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
 299        git reset --hard c1 &&
 300        test_must_fail git merge --squash --ff-only c2
 301'
 302
 303test_debug 'git log --graph --decorate --oneline --all'
 304
 305test_expect_success 'merge c1 with c2 and c3 (squash)' '
 306        git reset --hard c1 &&
 307        git merge --squash c2 c3 &&
 308        verify_merge file result.1-5-9 &&
 309        verify_head $c1 &&
 310        verify_no_mergehead &&
 311        test_cmp squash.1-5-9 .git/SQUASH_MSG
 312'
 313
 314test_debug 'git log --graph --decorate --oneline --all'
 315
 316test_expect_success 'merge c1 with c2 (no-commit in config)' '
 317        git reset --hard c1 &&
 318        git config branch.master.mergeoptions "--no-commit" &&
 319        git merge c2 &&
 320        verify_merge file result.1-5 &&
 321        verify_head $c1 &&
 322        verify_mergeheads $c2
 323'
 324
 325test_debug 'git log --graph --decorate --oneline --all'
 326
 327test_expect_success 'merge c1 with c2 (log in config)' '
 328        git config branch.master.mergeoptions "" &&
 329        git reset --hard c1 &&
 330        git merge --log c2 &&
 331        git show -s --pretty=tformat:%s%n%b >expect &&
 332
 333        git config branch.master.mergeoptions --log &&
 334        git reset --hard c1 &&
 335        git merge c2 &&
 336        git show -s --pretty=tformat:%s%n%b >actual &&
 337
 338        test_cmp expect actual
 339'
 340
 341test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
 342        (
 343                git config --remove-section branch.master
 344                git config --remove-section merge
 345        )
 346        git reset --hard c1 &&
 347        git merge c2 &&
 348        git show -s --pretty=tformat:%s%n%b >expect &&
 349
 350        git config branch.master.mergeoptions "--no-log" &&
 351        git config merge.log true &&
 352        git reset --hard c1 &&
 353        git merge c2 &&
 354        git show -s --pretty=tformat:%s%n%b >actual &&
 355
 356        test_cmp expect actual
 357'
 358
 359test_expect_success 'merge c1 with c2 (squash in config)' '
 360        git reset --hard c1 &&
 361        git config branch.master.mergeoptions "--squash" &&
 362        git merge c2 &&
 363        verify_merge file result.1-5 &&
 364        verify_head $c1 &&
 365        verify_no_mergehead &&
 366        test_cmp squash.1-5 .git/SQUASH_MSG
 367'
 368
 369test_debug 'git log --graph --decorate --oneline --all'
 370
 371test_expect_success 'override config option -n with --summary' '
 372        git reset --hard c1 &&
 373        git config branch.master.mergeoptions "-n" &&
 374        test_tick &&
 375        git merge --summary c2 >diffstat.txt &&
 376        verify_merge file result.1-5 msg.1-5 &&
 377        verify_parents $c1 $c2 &&
 378        if ! grep "^ file |  *2 +-$" diffstat.txt
 379        then
 380                echo "[OOPS] diffstat was not generated with --summary"
 381                false
 382        fi
 383'
 384
 385test_expect_success 'override config option -n with --stat' '
 386        git reset --hard c1 &&
 387        git config branch.master.mergeoptions "-n" &&
 388        test_tick &&
 389        git merge --stat c2 >diffstat.txt &&
 390        verify_merge file result.1-5 msg.1-5 &&
 391        verify_parents $c1 $c2 &&
 392        if ! grep "^ file |  *2 +-$" diffstat.txt
 393        then
 394                echo "[OOPS] diffstat was not generated with --stat"
 395                false
 396        fi
 397'
 398
 399test_debug 'git log --graph --decorate --oneline --all'
 400
 401test_expect_success 'override config option --stat' '
 402        git reset --hard c1 &&
 403        git config branch.master.mergeoptions "--stat" &&
 404        test_tick &&
 405        git merge -n c2 >diffstat.txt &&
 406        verify_merge file result.1-5 msg.1-5 &&
 407        verify_parents $c1 $c2 &&
 408        if grep "^ file |  *2 +-$" diffstat.txt
 409        then
 410                echo "[OOPS] diffstat was generated"
 411                false
 412        fi
 413'
 414
 415test_debug 'git log --graph --decorate --oneline --all'
 416
 417test_expect_success 'merge c1 with c2 (override --no-commit)' '
 418        git reset --hard c1 &&
 419        git config branch.master.mergeoptions "--no-commit" &&
 420        test_tick &&
 421        git merge --commit c2 &&
 422        verify_merge file result.1-5 msg.1-5 &&
 423        verify_parents $c1 $c2
 424'
 425
 426test_debug 'git log --graph --decorate --oneline --all'
 427
 428test_expect_success 'merge c1 with c2 (override --squash)' '
 429        git reset --hard c1 &&
 430        git config branch.master.mergeoptions "--squash" &&
 431        test_tick &&
 432        git merge --no-squash c2 &&
 433        verify_merge file result.1-5 msg.1-5 &&
 434        verify_parents $c1 $c2
 435'
 436
 437test_debug 'git log --graph --decorate --oneline --all'
 438
 439test_expect_success 'merge c0 with c1 (no-ff)' '
 440        git reset --hard c0 &&
 441        git config branch.master.mergeoptions "" &&
 442        test_tick &&
 443        git merge --no-ff c1 &&
 444        verify_merge file result.1 &&
 445        verify_parents $c0 $c1
 446'
 447
 448test_debug 'git log --graph --decorate --oneline --all'
 449
 450test_expect_success 'combining --squash and --no-ff is refused' '
 451        test_must_fail git merge --squash --no-ff c1 &&
 452        test_must_fail git merge --no-ff --squash c1
 453'
 454
 455test_expect_success 'combining --ff-only and --no-ff is refused' '
 456        test_must_fail git merge --ff-only --no-ff c1 &&
 457        test_must_fail git merge --no-ff --ff-only c1
 458'
 459
 460test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
 461        git reset --hard c0 &&
 462        git config branch.master.mergeoptions "--no-ff" &&
 463        git merge --ff c1 &&
 464        verify_merge file result.1 &&
 465        verify_head $c1
 466'
 467
 468test_expect_success 'merge log message' '
 469        git reset --hard c0 &&
 470        git merge --no-log c2 &&
 471        git show -s --pretty=format:%b HEAD >msg.act &&
 472        test_cmp msg.nolog msg.act &&
 473
 474        git merge --log c3 &&
 475        git show -s --pretty=format:%b HEAD >msg.act &&
 476        test_cmp msg.log msg.act &&
 477
 478        git reset --hard HEAD^ &&
 479        git config merge.log yes &&
 480        git merge c3 &&
 481        git show -s --pretty=format:%b HEAD >msg.act &&
 482        test_cmp msg.log msg.act
 483'
 484
 485test_debug 'git log --graph --decorate --oneline --all'
 486
 487test_expect_success 'merge c1 with c0, c2, c0, and c1' '
 488       git reset --hard c1 &&
 489       git config branch.master.mergeoptions "" &&
 490       test_tick &&
 491       git merge c0 c2 c0 c1 &&
 492       verify_merge file result.1-5 &&
 493       verify_parents $c1 $c2
 494'
 495
 496test_debug 'git log --graph --decorate --oneline --all'
 497
 498test_expect_success 'merge c1 with c0, c2, c0, and c1' '
 499       git reset --hard c1 &&
 500       git config branch.master.mergeoptions "" &&
 501       test_tick &&
 502       git merge c0 c2 c0 c1 &&
 503       verify_merge file result.1-5 &&
 504       verify_parents $c1 $c2
 505'
 506
 507test_debug 'git log --graph --decorate --oneline --all'
 508
 509test_expect_success 'merge c1 with c1 and c2' '
 510       git reset --hard c1 &&
 511       git config branch.master.mergeoptions "" &&
 512       test_tick &&
 513       git merge c1 c2 &&
 514       verify_merge file result.1-5 &&
 515       verify_parents $c1 $c2
 516'
 517
 518test_debug 'git log --graph --decorate --oneline --all'
 519
 520test_expect_success 'merge fast-forward in a dirty tree' '
 521       git reset --hard c0 &&
 522       mv file file1 &&
 523       cat file1 >file &&
 524       rm -f file1 &&
 525       git merge c2
 526'
 527
 528test_debug 'git log --graph --decorate --oneline --all'
 529
 530test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
 531        git reset --hard c0 &&
 532        git merge --no-ff -s resolve c1 >out &&
 533        grep "Wonderful." out &&
 534        verify_parents $c0 $c1
 535'
 536
 537test_debug 'git log --graph --decorate --oneline --all'
 538
 539test_expect_success 'refresh the index before merging' '
 540        git reset --hard c1 &&
 541        cp file file.n && mv -f file.n file &&
 542        git merge c3
 543'
 544
 545cat >expected.branch <<\EOF
 546Merge branch 'c5-branch' (early part)
 547EOF
 548cat >expected.tag <<\EOF
 549Merge commit 'c5~1'
 550EOF
 551
 552test_expect_success 'merge early part of c2' '
 553        git reset --hard c3 &&
 554        echo c4 >c4.c &&
 555        git add c4.c &&
 556        git commit -m c4 &&
 557        git tag c4 &&
 558        echo c5 >c5.c &&
 559        git add c5.c &&
 560        git commit -m c5 &&
 561        git tag c5 &&
 562        git reset --hard c3 &&
 563        echo c6 >c6.c &&
 564        git add c6.c &&
 565        git commit -m c6 &&
 566        git tag c6 &&
 567        git branch -f c5-branch c5 &&
 568        git merge c5-branch~1 &&
 569        git show -s --pretty=format:%s HEAD >actual.branch &&
 570        git reset --keep HEAD^ &&
 571        git merge c5~1 &&
 572        git show -s --pretty=format:%s HEAD >actual.tag &&
 573        test_cmp expected.branch actual.branch &&
 574        test_cmp expected.tag actual.tag
 575'
 576
 577test_debug 'git log --graph --decorate --oneline --all'
 578
 579test_expect_success 'merge --no-ff --no-commit && commit' '
 580        git reset --hard c0 &&
 581        git merge --no-ff --no-commit c1 &&
 582        EDITOR=: git commit &&
 583        verify_parents $c0 $c1
 584'
 585
 586test_debug 'git log --graph --decorate --oneline --all'
 587
 588test_expect_success 'amending no-ff merge commit' '
 589        EDITOR=: git commit --amend &&
 590        verify_parents $c0 $c1
 591'
 592
 593test_debug 'git log --graph --decorate --oneline --all'
 594
 595test_done