t / t4202-log.shon commit Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11 (6711759)
   1#!/bin/sh
   2
   3test_description='git log'
   4
   5. ./test-lib.sh
   6
   7test_expect_success setup '
   8
   9        echo one >one &&
  10        git add one &&
  11        test_tick &&
  12        git commit -m initial &&
  13
  14        echo ichi >one &&
  15        git add one &&
  16        test_tick &&
  17        git commit -m second &&
  18
  19        git mv one ichi &&
  20        test_tick &&
  21        git commit -m third &&
  22
  23        cp ichi ein &&
  24        git add ein &&
  25        test_tick &&
  26        git commit -m fourth &&
  27
  28        mkdir a &&
  29        echo ni >a/two &&
  30        git add a/two &&
  31        test_tick &&
  32        git commit -m fifth  &&
  33
  34        git rm a/two &&
  35        test_tick &&
  36        git commit -m sixth
  37
  38'
  39
  40printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" > expect
  41test_expect_success 'pretty' '
  42
  43        git log --pretty="format:%s" > actual &&
  44        test_cmp expect actual
  45'
  46
  47printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" > expect
  48test_expect_success 'pretty (tformat)' '
  49
  50        git log --pretty="tformat:%s" > actual &&
  51        test_cmp expect actual
  52'
  53
  54test_expect_success 'pretty (shortcut)' '
  55
  56        git log --pretty="%s" > actual &&
  57        test_cmp expect actual
  58'
  59
  60test_expect_success 'format' '
  61
  62        git log --format="%s" > actual &&
  63        test_cmp expect actual
  64'
  65
  66cat > expect << EOF
  67 This is
  68  the sixth
  69  commit.
  70 This is
  71  the fifth
  72  commit.
  73EOF
  74
  75test_expect_success 'format %w(12,1,2)' '
  76
  77        git log -2 --format="%w(12,1,2)This is the %s commit." > actual &&
  78        test_cmp expect actual
  79'
  80
  81test_expect_success 'format %w(,1,2)' '
  82
  83        git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
  84        test_cmp expect actual
  85'
  86
  87cat > expect << EOF
  88804a787 sixth
  89394ef78 fifth
  905d31159 fourth
  912fbe8c0 third
  92f7dab8e second
  933a2fdcb initial
  94EOF
  95test_expect_success 'oneline' '
  96
  97        git log --oneline > actual &&
  98        test_cmp expect actual
  99'
 100
 101test_expect_success 'diff-filter=A' '
 102
 103        git log --pretty="format:%s" --diff-filter=A HEAD > actual &&
 104        git log --pretty="format:%s" --diff-filter A HEAD > actual-separate &&
 105        printf "fifth\nfourth\nthird\ninitial" > expect &&
 106        test_cmp expect actual &&
 107        test_cmp expect actual-separate
 108
 109'
 110
 111test_expect_success 'diff-filter=M' '
 112
 113        actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
 114        expect=$(echo second) &&
 115        test "$actual" = "$expect" || {
 116                echo Oops
 117                echo "Actual: $actual"
 118                false
 119        }
 120
 121'
 122
 123test_expect_success 'diff-filter=D' '
 124
 125        actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) &&
 126        expect=$(echo sixth ; echo third) &&
 127        test "$actual" = "$expect" || {
 128                echo Oops
 129                echo "Actual: $actual"
 130                false
 131        }
 132
 133'
 134
 135test_expect_success 'diff-filter=R' '
 136
 137        actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
 138        expect=$(echo third) &&
 139        test "$actual" = "$expect" || {
 140                echo Oops
 141                echo "Actual: $actual"
 142                false
 143        }
 144
 145'
 146
 147test_expect_success 'diff-filter=C' '
 148
 149        actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
 150        expect=$(echo fourth) &&
 151        test "$actual" = "$expect" || {
 152                echo Oops
 153                echo "Actual: $actual"
 154                false
 155        }
 156
 157'
 158
 159test_expect_success 'git log --follow' '
 160
 161        actual=$(git log --follow --pretty="format:%s" ichi) &&
 162        expect=$(echo third ; echo second ; echo initial) &&
 163        test "$actual" = "$expect" || {
 164                echo Oops
 165                echo "Actual: $actual"
 166                false
 167        }
 168
 169'
 170
 171cat > expect << EOF
 172804a787 sixth
 173394ef78 fifth
 1745d31159 fourth
 175EOF
 176test_expect_success 'git log --no-walk <commits> sorts by commit time' '
 177        git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
 178        test_cmp expect actual
 179'
 180
 181cat > expect << EOF
 1825d31159 fourth
 183804a787 sixth
 184394ef78 fifth
 185EOF
 186test_expect_success 'git show <commits> leaves list of commits as given' '
 187        git show --oneline -s 5d31159 804a787 394ef78 > actual &&
 188        test_cmp expect actual
 189'
 190
 191test_expect_success 'setup case sensitivity tests' '
 192        echo case >one &&
 193        test_tick &&
 194        git add one &&
 195        git commit -a -m Second
 196'
 197
 198test_expect_success 'log --grep' '
 199        echo second >expect &&
 200        git log -1 --pretty="tformat:%s" --grep=sec >actual &&
 201        test_cmp expect actual
 202'
 203
 204test_expect_success 'log --grep option parsing' '
 205        echo second >expect &&
 206        git log -1 --pretty="tformat:%s" --grep sec >actual &&
 207        test_cmp expect actual &&
 208        test_must_fail git log -1 --pretty="tformat:%s" --grep
 209'
 210
 211test_expect_success 'log -i --grep' '
 212        echo Second >expect &&
 213        git log -1 --pretty="tformat:%s" -i --grep=sec >actual &&
 214        test_cmp expect actual
 215'
 216
 217test_expect_success 'log --grep -i' '
 218        echo Second >expect &&
 219        git log -1 --pretty="tformat:%s" --grep=sec -i >actual &&
 220        test_cmp expect actual
 221'
 222
 223cat > expect <<EOF
 224* Second
 225* sixth
 226* fifth
 227* fourth
 228* third
 229* second
 230* initial
 231EOF
 232
 233test_expect_success 'simple log --graph' '
 234        git log --graph --pretty=tformat:%s >actual &&
 235        test_cmp expect actual
 236'
 237
 238test_expect_success 'set up merge history' '
 239        git checkout -b side HEAD~4 &&
 240        test_commit side-1 1 1 &&
 241        test_commit side-2 2 2 &&
 242        git checkout master &&
 243        git merge side
 244'
 245
 246cat > expect <<\EOF
 247*   Merge branch 'side'
 248|\
 249| * side-2
 250| * side-1
 251* | Second
 252* | sixth
 253* | fifth
 254* | fourth
 255|/
 256* third
 257* second
 258* initial
 259EOF
 260
 261test_expect_success 'log --graph with merge' '
 262        git log --graph --date-order --pretty=tformat:%s |
 263                sed "s/ *\$//" >actual &&
 264        test_cmp expect actual
 265'
 266
 267cat > expect <<\EOF
 268*   commit master
 269|\  Merge: A B
 270| | Author: A U Thor <author@example.com>
 271| |
 272| |     Merge branch 'side'
 273| |
 274| * commit side
 275| | Author: A U Thor <author@example.com>
 276| |
 277| |     side-2
 278| |
 279| * commit tags/side-1
 280| | Author: A U Thor <author@example.com>
 281| |
 282| |     side-1
 283| |
 284* | commit master~1
 285| | Author: A U Thor <author@example.com>
 286| |
 287| |     Second
 288| |
 289* | commit master~2
 290| | Author: A U Thor <author@example.com>
 291| |
 292| |     sixth
 293| |
 294* | commit master~3
 295| | Author: A U Thor <author@example.com>
 296| |
 297| |     fifth
 298| |
 299* | commit master~4
 300|/  Author: A U Thor <author@example.com>
 301|
 302|       fourth
 303|
 304* commit tags/side-1~1
 305| Author: A U Thor <author@example.com>
 306|
 307|     third
 308|
 309* commit tags/side-1~2
 310| Author: A U Thor <author@example.com>
 311|
 312|     second
 313|
 314* commit tags/side-1~3
 315  Author: A U Thor <author@example.com>
 316
 317      initial
 318EOF
 319
 320test_expect_success 'log --graph with full output' '
 321        git log --graph --date-order --pretty=short |
 322                git name-rev --name-only --stdin |
 323                sed "s/Merge:.*/Merge: A B/;s/ *\$//" >actual &&
 324        test_cmp expect actual
 325'
 326
 327test_expect_success 'set up more tangled history' '
 328        git checkout -b tangle HEAD~6 &&
 329        test_commit tangle-a tangle-a a &&
 330        git merge master~3 &&
 331        git merge side~1 &&
 332        git checkout master &&
 333        git merge tangle &&
 334        git checkout -b reach &&
 335        test_commit reach &&
 336        git checkout master &&
 337        git checkout -b octopus-a &&
 338        test_commit octopus-a &&
 339        git checkout master &&
 340        git checkout -b octopus-b &&
 341        test_commit octopus-b &&
 342        git checkout master &&
 343        test_commit seventh &&
 344        git merge octopus-a octopus-b &&
 345        git merge reach
 346'
 347
 348cat > expect <<\EOF
 349*   Merge tag 'reach'
 350|\
 351| \
 352|  \
 353*-. \   Merge tags 'octopus-a' and 'octopus-b'
 354|\ \ \
 355* | | | seventh
 356| | * | octopus-b
 357| |/ /
 358|/| |
 359| * | octopus-a
 360|/ /
 361| * reach
 362|/
 363*   Merge branch 'tangle'
 364|\
 365| *   Merge branch 'side' (early part) into tangle
 366| |\
 367| * \   Merge branch 'master' (early part) into tangle
 368| |\ \
 369| * | | tangle-a
 370* | | |   Merge branch 'side'
 371|\ \ \ \
 372| * | | | side-2
 373| | |_|/
 374| |/| |
 375| * | | side-1
 376* | | | Second
 377* | | | sixth
 378| |_|/
 379|/| |
 380* | | fifth
 381* | | fourth
 382|/ /
 383* | third
 384|/
 385* second
 386* initial
 387EOF
 388
 389test_expect_success 'log --graph with merge' '
 390        git log --graph --date-order --pretty=tformat:%s |
 391                sed "s/ *\$//" >actual &&
 392        test_cmp expect actual
 393'
 394
 395test_expect_success 'log.decorate configuration' '
 396        test_might_fail git config --unset-all log.decorate &&
 397
 398        git log --oneline >expect.none &&
 399        git log --oneline --decorate >expect.short &&
 400        git log --oneline --decorate=full >expect.full &&
 401
 402        echo "[log] decorate" >>.git/config &&
 403        git log --oneline >actual &&
 404        test_cmp expect.short actual &&
 405
 406        git config --unset-all log.decorate &&
 407        git config log.decorate true &&
 408        git log --oneline >actual &&
 409        test_cmp expect.short actual &&
 410        git log --oneline --decorate=full >actual &&
 411        test_cmp expect.full actual &&
 412        git log --oneline --decorate=no >actual &&
 413        test_cmp expect.none actual &&
 414
 415        git config --unset-all log.decorate &&
 416        git config log.decorate no &&
 417        git log --oneline >actual &&
 418        test_cmp expect.none actual &&
 419        git log --oneline --decorate >actual &&
 420        test_cmp expect.short actual &&
 421        git log --oneline --decorate=full >actual &&
 422        test_cmp expect.full actual &&
 423
 424        git config --unset-all log.decorate &&
 425        git config log.decorate 1 &&
 426        git log --oneline >actual &&
 427        test_cmp expect.short actual &&
 428        git log --oneline --decorate=full >actual &&
 429        test_cmp expect.full actual &&
 430        git log --oneline --decorate=no >actual &&
 431        test_cmp expect.none actual &&
 432
 433        git config --unset-all log.decorate &&
 434        git config log.decorate short &&
 435        git log --oneline >actual &&
 436        test_cmp expect.short actual &&
 437        git log --oneline --no-decorate >actual &&
 438        test_cmp expect.none actual &&
 439        git log --oneline --decorate=full >actual &&
 440        test_cmp expect.full actual &&
 441
 442        git config --unset-all log.decorate &&
 443        git config log.decorate full &&
 444        git log --oneline >actual &&
 445        test_cmp expect.full actual &&
 446        git log --oneline --no-decorate >actual &&
 447        test_cmp expect.none actual &&
 448        git log --oneline --decorate >actual &&
 449        test_cmp expect.short actual
 450
 451        git config --unset-all log.decorate &&
 452        git log --pretty=raw >expect.raw &&
 453        git config log.decorate full &&
 454        git log --pretty=raw >actual &&
 455        test_cmp expect.raw actual
 456
 457'
 458
 459test_expect_success 'reflog is expected format' '
 460        test_might_fail git config --remove-section log &&
 461        git log -g --abbrev-commit --pretty=oneline >expect &&
 462        git reflog >actual &&
 463        test_cmp expect actual
 464'
 465
 466test_expect_success 'whatchanged is expected format' '
 467        git log --no-merges --raw >expect &&
 468        git whatchanged >actual &&
 469        test_cmp expect actual
 470'
 471
 472test_expect_success 'log.abbrevCommit configuration' '
 473        test_when_finished "git config --unset log.abbrevCommit" &&
 474
 475        test_might_fail git config --unset log.abbrevCommit &&
 476
 477        git log --abbrev-commit >expect.log.abbrev &&
 478        git log --no-abbrev-commit >expect.log.full &&
 479        git log --pretty=raw >expect.log.raw &&
 480        git reflog --abbrev-commit >expect.reflog.abbrev &&
 481        git reflog --no-abbrev-commit >expect.reflog.full &&
 482        git whatchanged --abbrev-commit >expect.whatchanged.abbrev &&
 483        git whatchanged --no-abbrev-commit >expect.whatchanged.full &&
 484
 485        git config log.abbrevCommit true &&
 486
 487        git log >actual &&
 488        test_cmp expect.log.abbrev actual &&
 489        git log --no-abbrev-commit >actual &&
 490        test_cmp expect.log.full actual &&
 491
 492        git log --pretty=raw >actual &&
 493        test_cmp expect.log.raw actual &&
 494
 495        git reflog >actual &&
 496        test_cmp expect.reflog.abbrev actual &&
 497        git reflog --no-abbrev-commit >actual &&
 498        test_cmp expect.reflog.full actual &&
 499
 500        git whatchanged >actual &&
 501        test_cmp expect.whatchanged.abbrev actual &&
 502        git whatchanged --no-abbrev-commit >actual &&
 503        test_cmp expect.whatchanged.full actual
 504'
 505
 506test_expect_success 'show added path under "--follow -M"' '
 507        # This tests for a regression introduced in v1.7.2-rc0~103^2~2
 508        test_create_repo regression &&
 509        (
 510                cd regression &&
 511                test_commit needs-another-commit &&
 512                test_commit foo.bar &&
 513                git log -M --follow -p foo.bar.t &&
 514                git log -M --follow --stat foo.bar.t &&
 515                git log -M --follow --name-only foo.bar.t
 516        )
 517'
 518
 519cat >expect <<\EOF
 520*   commit COMMIT_OBJECT_NAME
 521|\  Merge: MERGE_PARENTS
 522| | Author: A U Thor <author@example.com>
 523| |
 524| |     Merge HEADS DESCRIPTION
 525| |
 526| * commit COMMIT_OBJECT_NAME
 527| | Author: A U Thor <author@example.com>
 528| |
 529| |     reach
 530| | ---
 531| |  reach.t | 1 +
 532| |  1 file changed, 1 insertion(+)
 533| |
 534| | diff --git a/reach.t b/reach.t
 535| | new file mode 100644
 536| | index 0000000..10c9591
 537| | --- /dev/null
 538| | +++ b/reach.t
 539| | @@ -0,0 +1 @@
 540| | +reach
 541| |
 542|  \
 543*-. \   commit COMMIT_OBJECT_NAME
 544|\ \ \  Merge: MERGE_PARENTS
 545| | | | Author: A U Thor <author@example.com>
 546| | | |
 547| | | |     Merge HEADS DESCRIPTION
 548| | | |
 549| | * | commit COMMIT_OBJECT_NAME
 550| | |/  Author: A U Thor <author@example.com>
 551| | |
 552| | |       octopus-b
 553| | |   ---
 554| | |    octopus-b.t | 1 +
 555| | |    1 file changed, 1 insertion(+)
 556| | |
 557| | |   diff --git a/octopus-b.t b/octopus-b.t
 558| | |   new file mode 100644
 559| | |   index 0000000..d5fcad0
 560| | |   --- /dev/null
 561| | |   +++ b/octopus-b.t
 562| | |   @@ -0,0 +1 @@
 563| | |   +octopus-b
 564| | |
 565| * | commit COMMIT_OBJECT_NAME
 566| |/  Author: A U Thor <author@example.com>
 567| |
 568| |       octopus-a
 569| |   ---
 570| |    octopus-a.t | 1 +
 571| |    1 file changed, 1 insertion(+)
 572| |
 573| |   diff --git a/octopus-a.t b/octopus-a.t
 574| |   new file mode 100644
 575| |   index 0000000..11ee015
 576| |   --- /dev/null
 577| |   +++ b/octopus-a.t
 578| |   @@ -0,0 +1 @@
 579| |   +octopus-a
 580| |
 581* | commit COMMIT_OBJECT_NAME
 582|/  Author: A U Thor <author@example.com>
 583|
 584|       seventh
 585|   ---
 586|    seventh.t | 1 +
 587|    1 file changed, 1 insertion(+)
 588|
 589|   diff --git a/seventh.t b/seventh.t
 590|   new file mode 100644
 591|   index 0000000..9744ffc
 592|   --- /dev/null
 593|   +++ b/seventh.t
 594|   @@ -0,0 +1 @@
 595|   +seventh
 596|
 597*   commit COMMIT_OBJECT_NAME
 598|\  Merge: MERGE_PARENTS
 599| | Author: A U Thor <author@example.com>
 600| |
 601| |     Merge branch 'tangle'
 602| |
 603| *   commit COMMIT_OBJECT_NAME
 604| |\  Merge: MERGE_PARENTS
 605| | | Author: A U Thor <author@example.com>
 606| | |
 607| | |     Merge branch 'side' (early part) into tangle
 608| | |
 609| * |   commit COMMIT_OBJECT_NAME
 610| |\ \  Merge: MERGE_PARENTS
 611| | | | Author: A U Thor <author@example.com>
 612| | | |
 613| | | |     Merge branch 'master' (early part) into tangle
 614| | | |
 615| * | | commit COMMIT_OBJECT_NAME
 616| | | | Author: A U Thor <author@example.com>
 617| | | |
 618| | | |     tangle-a
 619| | | | ---
 620| | | |  tangle-a | 1 +
 621| | | |  1 file changed, 1 insertion(+)
 622| | | |
 623| | | | diff --git a/tangle-a b/tangle-a
 624| | | | new file mode 100644
 625| | | | index 0000000..7898192
 626| | | | --- /dev/null
 627| | | | +++ b/tangle-a
 628| | | | @@ -0,0 +1 @@
 629| | | | +a
 630| | | |
 631* | | |   commit COMMIT_OBJECT_NAME
 632|\ \ \ \  Merge: MERGE_PARENTS
 633| | | | | Author: A U Thor <author@example.com>
 634| | | | |
 635| | | | |     Merge branch 'side'
 636| | | | |
 637| * | | | commit COMMIT_OBJECT_NAME
 638| | |_|/  Author: A U Thor <author@example.com>
 639| |/| |
 640| | | |       side-2
 641| | | |   ---
 642| | | |    2 | 1 +
 643| | | |    1 file changed, 1 insertion(+)
 644| | | |
 645| | | |   diff --git a/2 b/2
 646| | | |   new file mode 100644
 647| | | |   index 0000000..0cfbf08
 648| | | |   --- /dev/null
 649| | | |   +++ b/2
 650| | | |   @@ -0,0 +1 @@
 651| | | |   +2
 652| | | |
 653| * | | commit COMMIT_OBJECT_NAME
 654| | | | Author: A U Thor <author@example.com>
 655| | | |
 656| | | |     side-1
 657| | | | ---
 658| | | |  1 | 1 +
 659| | | |  1 file changed, 1 insertion(+)
 660| | | |
 661| | | | diff --git a/1 b/1
 662| | | | new file mode 100644
 663| | | | index 0000000..d00491f
 664| | | | --- /dev/null
 665| | | | +++ b/1
 666| | | | @@ -0,0 +1 @@
 667| | | | +1
 668| | | |
 669* | | | commit COMMIT_OBJECT_NAME
 670| | | | Author: A U Thor <author@example.com>
 671| | | |
 672| | | |     Second
 673| | | | ---
 674| | | |  one | 1 +
 675| | | |  1 file changed, 1 insertion(+)
 676| | | |
 677| | | | diff --git a/one b/one
 678| | | | new file mode 100644
 679| | | | index 0000000..9a33383
 680| | | | --- /dev/null
 681| | | | +++ b/one
 682| | | | @@ -0,0 +1 @@
 683| | | | +case
 684| | | |
 685* | | | commit COMMIT_OBJECT_NAME
 686| |_|/  Author: A U Thor <author@example.com>
 687|/| |
 688| | |       sixth
 689| | |   ---
 690| | |    a/two | 1 -
 691| | |    1 file changed, 1 deletion(-)
 692| | |
 693| | |   diff --git a/a/two b/a/two
 694| | |   deleted file mode 100644
 695| | |   index 9245af5..0000000
 696| | |   --- a/a/two
 697| | |   +++ /dev/null
 698| | |   @@ -1 +0,0 @@
 699| | |   -ni
 700| | |
 701* | | commit COMMIT_OBJECT_NAME
 702| | | Author: A U Thor <author@example.com>
 703| | |
 704| | |     fifth
 705| | | ---
 706| | |  a/two | 1 +
 707| | |  1 file changed, 1 insertion(+)
 708| | |
 709| | | diff --git a/a/two b/a/two
 710| | | new file mode 100644
 711| | | index 0000000..9245af5
 712| | | --- /dev/null
 713| | | +++ b/a/two
 714| | | @@ -0,0 +1 @@
 715| | | +ni
 716| | |
 717* | | commit COMMIT_OBJECT_NAME
 718|/ /  Author: A U Thor <author@example.com>
 719| |
 720| |       fourth
 721| |   ---
 722| |    ein | 1 +
 723| |    1 file changed, 1 insertion(+)
 724| |
 725| |   diff --git a/ein b/ein
 726| |   new file mode 100644
 727| |   index 0000000..9d7e69f
 728| |   --- /dev/null
 729| |   +++ b/ein
 730| |   @@ -0,0 +1 @@
 731| |   +ichi
 732| |
 733* | commit COMMIT_OBJECT_NAME
 734|/  Author: A U Thor <author@example.com>
 735|
 736|       third
 737|   ---
 738|    ichi | 1 +
 739|    one  | 1 -
 740|    2 files changed, 1 insertion(+), 1 deletion(-)
 741|
 742|   diff --git a/ichi b/ichi
 743|   new file mode 100644
 744|   index 0000000..9d7e69f
 745|   --- /dev/null
 746|   +++ b/ichi
 747|   @@ -0,0 +1 @@
 748|   +ichi
 749|   diff --git a/one b/one
 750|   deleted file mode 100644
 751|   index 9d7e69f..0000000
 752|   --- a/one
 753|   +++ /dev/null
 754|   @@ -1 +0,0 @@
 755|   -ichi
 756|
 757* commit COMMIT_OBJECT_NAME
 758| Author: A U Thor <author@example.com>
 759|
 760|     second
 761| ---
 762|  one | 2 +-
 763|  1 file changed, 1 insertion(+), 1 deletion(-)
 764|
 765| diff --git a/one b/one
 766| index 5626abf..9d7e69f 100644
 767| --- a/one
 768| +++ b/one
 769| @@ -1 +1 @@
 770| -one
 771| +ichi
 772|
 773* commit COMMIT_OBJECT_NAME
 774  Author: A U Thor <author@example.com>
 775
 776      initial
 777  ---
 778   one | 1 +
 779   1 file changed, 1 insertion(+)
 780
 781  diff --git a/one b/one
 782  new file mode 100644
 783  index 0000000..5626abf
 784  --- /dev/null
 785  +++ b/one
 786  @@ -0,0 +1 @@
 787  +one
 788EOF
 789
 790sanitize_output () {
 791        sed -e 's/ *$//' \
 792            -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
 793            -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
 794            -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
 795            -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
 796            -e 's/, 0 deletions(-)//' \
 797            -e 's/, 0 insertions(+)//' \
 798            -e 's/ 1 files changed, / 1 file changed, /' \
 799            -e 's/, 1 deletions(-)/, 1 deletion(-)/' \
 800            -e 's/, 1 insertions(+)/, 1 insertion(+)/'
 801}
 802
 803test_expect_success 'log --graph with diff and stats' '
 804        git log --graph --pretty=short --stat -p >actual &&
 805        sanitize_output >actual.sanitized <actual &&
 806        test_cmp expect actual.sanitized
 807'
 808
 809test_expect_success 'dotdot is a parent directory' '
 810        mkdir -p a/b &&
 811        ( echo sixth && echo fifth ) >expect &&
 812        ( cd a/b && git log --format=%s .. ) >actual &&
 813        test_cmp expect actual
 814'
 815
 816test_done