t / t4015-diff-whitespace.shon commit cache-tree: reject entries with null sha1 (a96d3cc)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Johannes E. Schindelin
   4#
   5
   6test_description='Test special whitespace in diff engine.
   7
   8'
   9. ./test-lib.sh
  10. "$TEST_DIRECTORY"/diff-lib.sh
  11
  12test_expect_success "Ray Lehtiniemi's example" '
  13        cat <<-\EOF >x &&
  14        do {
  15           nothing;
  16        } while (0);
  17        EOF
  18        git update-index --add x &&
  19
  20        cat <<-\EOF >x &&
  21        do
  22        {
  23           nothing;
  24        }
  25        while (0);
  26        EOF
  27
  28        cat <<-\EOF >expect &&
  29        diff --git a/x b/x
  30        index adf3937..6edc172 100644
  31        --- a/x
  32        +++ b/x
  33        @@ -1,3 +1,5 @@
  34        -do {
  35        +do
  36        +{
  37            nothing;
  38        -} while (0);
  39        +}
  40        +while (0);
  41        EOF
  42
  43        git diff >out &&
  44        test_cmp expect out &&
  45
  46        git diff -w >out &&
  47        test_cmp expect out &&
  48
  49        git diff -b >out &&
  50        test_cmp expect out
  51'
  52
  53test_expect_success 'another test, without options' '
  54        tr Q "\015" <<-\EOF >x &&
  55        whitespace at beginning
  56        whitespace change
  57        whitespace in the middle
  58        whitespace at end
  59        unchanged line
  60        CR at endQ
  61        EOF
  62
  63        git update-index x &&
  64
  65        tr "_" " " <<-\EOF >x &&
  66        _       whitespace at beginning
  67        whitespace       change
  68        white space in the middle
  69        whitespace at end__
  70        unchanged line
  71        CR at end
  72        EOF
  73
  74        tr "Q_" "\015 " <<-\EOF >expect &&
  75        diff --git a/x b/x
  76        index d99af23..22d9f73 100644
  77        --- a/x
  78        +++ b/x
  79        @@ -1,6 +1,6 @@
  80        -whitespace at beginning
  81        -whitespace change
  82        -whitespace in the middle
  83        -whitespace at end
  84        +       whitespace at beginning
  85        +whitespace      change
  86        +white space in the middle
  87        +whitespace at end__
  88         unchanged line
  89        -CR at endQ
  90        +CR at end
  91        EOF
  92
  93        git diff >out &&
  94        test_cmp expect out &&
  95
  96        >expect &&
  97        git diff -w >out &&
  98        test_cmp expect out &&
  99
 100        git diff -w -b >out &&
 101        test_cmp expect out &&
 102
 103        git diff -w --ignore-space-at-eol >out &&
 104        test_cmp expect out &&
 105
 106        git diff -w -b --ignore-space-at-eol >out &&
 107        test_cmp expect out &&
 108
 109
 110        tr "Q_" "\015 " <<-\EOF >expect &&
 111        diff --git a/x b/x
 112        index d99af23..22d9f73 100644
 113        --- a/x
 114        +++ b/x
 115        @@ -1,6 +1,6 @@
 116        -whitespace at beginning
 117        +_      whitespace at beginning
 118         whitespace      change
 119        -whitespace in the middle
 120        +white space in the middle
 121         whitespace at end__
 122         unchanged line
 123         CR at end
 124        EOF
 125        git diff -b >out &&
 126        test_cmp expect out &&
 127
 128        git diff -b --ignore-space-at-eol >out &&
 129        test_cmp expect out &&
 130
 131        tr "Q_" "\015 " <<-\EOF >expect &&
 132        diff --git a/x b/x
 133        index d99af23..22d9f73 100644
 134        --- a/x
 135        +++ b/x
 136        @@ -1,6 +1,6 @@
 137        -whitespace at beginning
 138        -whitespace change
 139        -whitespace in the middle
 140        +_      whitespace at beginning
 141        +whitespace      change
 142        +white space in the middle
 143         whitespace at end__
 144         unchanged line
 145         CR at end
 146        EOF
 147        git diff --ignore-space-at-eol >out &&
 148        test_cmp expect out
 149'
 150
 151test_expect_success 'ignore-blank-lines: only new lines' '
 152        test_seq 5 >x &&
 153        git update-index x &&
 154        test_seq 5 | sed "/3/i\\
 155" >x &&
 156        git diff --ignore-blank-lines >out &&
 157        >expect &&
 158        test_cmp out expect
 159'
 160
 161test_expect_success 'ignore-blank-lines: only new lines with space' '
 162        test_seq 5 >x &&
 163        git update-index x &&
 164        test_seq 5 | sed "/3/i\\
 165 " >x &&
 166        git diff -w --ignore-blank-lines >out &&
 167        >expect &&
 168        test_cmp out expect
 169'
 170
 171test_expect_success 'ignore-blank-lines: after change' '
 172        cat <<-\EOF >x &&
 173        1
 174        2
 175
 176        3
 177        4
 178        5
 179
 180        6
 181        7
 182        EOF
 183        git update-index x &&
 184        cat <<-\EOF >x &&
 185        change
 186
 187        1
 188        2
 189        3
 190        4
 191        5
 192        6
 193
 194        7
 195        EOF
 196        git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
 197        cat <<-\EOF >expected &&
 198        diff --git a/x b/x
 199        --- a/x
 200        +++ b/x
 201        @@ -1,6 +1,7 @@
 202        +change
 203        +
 204         1
 205         2
 206        -
 207         3
 208         4
 209         5
 210        EOF
 211        compare_diff_patch expected out.tmp
 212'
 213
 214test_expect_success 'ignore-blank-lines: before change' '
 215        cat <<-\EOF >x &&
 216        1
 217        2
 218
 219        3
 220        4
 221        5
 222        6
 223        7
 224        EOF
 225        git update-index x &&
 226        cat <<-\EOF >x &&
 227
 228        1
 229        2
 230        3
 231        4
 232        5
 233
 234        6
 235        7
 236        change
 237        EOF
 238        git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
 239        cat <<-\EOF >expected &&
 240        diff --git a/x b/x
 241        --- a/x
 242        +++ b/x
 243        @@ -4,5 +4,7 @@
 244         3
 245         4
 246         5
 247        +
 248         6
 249         7
 250        +change
 251        EOF
 252        compare_diff_patch expected out.tmp
 253'
 254
 255test_expect_success 'ignore-blank-lines: between changes' '
 256        cat <<-\EOF >x &&
 257        1
 258        2
 259        3
 260        4
 261        5
 262
 263
 264        6
 265        7
 266        8
 267        9
 268        10
 269        EOF
 270        git update-index x &&
 271        cat <<-\EOF >x &&
 272        change
 273        1
 274        2
 275
 276        3
 277        4
 278        5
 279        6
 280        7
 281        8
 282
 283        9
 284        10
 285        change
 286        EOF
 287        git diff --ignore-blank-lines >out.tmp &&
 288        cat <<-\EOF >expected &&
 289        diff --git a/x b/x
 290        --- a/x
 291        +++ b/x
 292        @@ -1,5 +1,7 @@
 293        +change
 294         1
 295         2
 296        +
 297         3
 298         4
 299         5
 300        @@ -8,5 +8,7 @@
 301         6
 302         7
 303         8
 304        +
 305         9
 306         10
 307        +change
 308        EOF
 309        compare_diff_patch expected out.tmp
 310'
 311
 312test_expect_success 'ignore-blank-lines: between changes (with interhunkctx)' '
 313        test_seq 10 >x &&
 314        git update-index x &&
 315        cat <<-\EOF >x &&
 316        change
 317        1
 318        2
 319
 320        3
 321        4
 322        5
 323
 324        6
 325        7
 326        8
 327        9
 328
 329        10
 330        change
 331        EOF
 332        git diff --inter-hunk-context=2 --ignore-blank-lines >out.tmp &&
 333        cat <<-\EOF >expected &&
 334        diff --git a/x b/x
 335        --- a/x
 336        +++ b/x
 337        @@ -1,10 +1,15 @@
 338        +change
 339         1
 340         2
 341        +
 342         3
 343         4
 344         5
 345        +
 346         6
 347         7
 348         8
 349         9
 350        +
 351         10
 352        +change
 353        EOF
 354        compare_diff_patch expected out.tmp
 355'
 356
 357test_expect_success 'ignore-blank-lines: scattered spaces' '
 358        test_seq 10 >x &&
 359        git update-index x &&
 360        cat <<-\EOF >x &&
 361        change
 362        1
 363        2
 364        3
 365
 366        4
 367
 368        5
 369
 370        6
 371
 372
 373        7
 374
 375        8
 376        9
 377        10
 378        change
 379        EOF
 380        git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
 381        cat <<-\EOF >expected &&
 382        diff --git a/x b/x
 383        --- a/x
 384        +++ b/x
 385        @@ -1,3 +1,4 @@
 386        +change
 387         1
 388         2
 389         3
 390        @@ -8,3 +15,4 @@
 391         8
 392         9
 393         10
 394        +change
 395        EOF
 396        compare_diff_patch expected out.tmp
 397'
 398
 399test_expect_success 'ignore-blank-lines: spaces coalesce' '
 400        test_seq 6 >x &&
 401        git update-index x &&
 402        cat <<-\EOF >x &&
 403        change
 404        1
 405        2
 406        3
 407
 408        4
 409
 410        5
 411
 412        6
 413        change
 414        EOF
 415        git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
 416        cat <<-\EOF >expected &&
 417        diff --git a/x b/x
 418        --- a/x
 419        +++ b/x
 420        @@ -1,6 +1,11 @@
 421        +change
 422         1
 423         2
 424         3
 425        +
 426         4
 427        +
 428         5
 429        +
 430         6
 431        +change
 432        EOF
 433        compare_diff_patch expected out.tmp
 434'
 435
 436test_expect_success 'ignore-blank-lines: mix changes and blank lines' '
 437        test_seq 16 >x &&
 438        git update-index x &&
 439        cat <<-\EOF >x &&
 440        change
 441        1
 442        2
 443
 444        3
 445        4
 446        5
 447        change
 448        6
 449        7
 450        8
 451
 452        9
 453        10
 454        11
 455        change
 456        12
 457        13
 458        14
 459
 460        15
 461        16
 462        change
 463        EOF
 464        git diff --ignore-blank-lines >out.tmp &&
 465        cat <<-\EOF >expected &&
 466        diff --git a/x b/x
 467        --- a/x
 468        +++ b/x
 469        @@ -1,8 +1,11 @@
 470        +change
 471         1
 472         2
 473        +
 474         3
 475         4
 476         5
 477        +change
 478         6
 479         7
 480         8
 481        @@ -9,8 +13,11 @@
 482         9
 483         10
 484         11
 485        +change
 486         12
 487         13
 488         14
 489        +
 490         15
 491         16
 492        +change
 493        EOF
 494        compare_diff_patch expected out.tmp
 495'
 496
 497test_expect_success 'check mixed spaces and tabs in indent' '
 498        # This is indented with SP HT SP.
 499        echo "   foo();" >x &&
 500        git diff --check | grep "space before tab in indent"
 501'
 502
 503test_expect_success 'check mixed tabs and spaces in indent' '
 504        # This is indented with HT SP HT.
 505        echo "          foo();" >x &&
 506        git diff --check | grep "space before tab in indent"
 507'
 508
 509test_expect_success 'check with no whitespace errors' '
 510        git commit -m "snapshot" &&
 511        echo "foo();" >x &&
 512        git diff --check
 513'
 514
 515test_expect_success 'check with trailing whitespace' '
 516        echo "foo(); " >x &&
 517        test_must_fail git diff --check
 518'
 519
 520test_expect_success 'check with space before tab in indent' '
 521        # indent has space followed by hard tab
 522        echo "  foo();" >x &&
 523        test_must_fail git diff --check
 524'
 525
 526test_expect_success '--check and --exit-code are not exclusive' '
 527        git checkout x &&
 528        git diff --check --exit-code
 529'
 530
 531test_expect_success '--check and --quiet are not exclusive' '
 532        git diff --check --quiet
 533'
 534
 535test_expect_success 'check staged with no whitespace errors' '
 536        echo "foo();" >x &&
 537        git add x &&
 538        git diff --cached --check
 539'
 540
 541test_expect_success 'check staged with trailing whitespace' '
 542        echo "foo(); " >x &&
 543        git add x &&
 544        test_must_fail git diff --cached --check
 545'
 546
 547test_expect_success 'check staged with space before tab in indent' '
 548        # indent has space followed by hard tab
 549        echo "  foo();" >x &&
 550        git add x &&
 551        test_must_fail git diff --cached --check
 552'
 553
 554test_expect_success 'check with no whitespace errors (diff-index)' '
 555        echo "foo();" >x &&
 556        git add x &&
 557        git diff-index --check HEAD
 558'
 559
 560test_expect_success 'check with trailing whitespace (diff-index)' '
 561        echo "foo(); " >x &&
 562        git add x &&
 563        test_must_fail git diff-index --check HEAD
 564'
 565
 566test_expect_success 'check with space before tab in indent (diff-index)' '
 567        # indent has space followed by hard tab
 568        echo "  foo();" >x &&
 569        git add x &&
 570        test_must_fail git diff-index --check HEAD
 571'
 572
 573test_expect_success 'check staged with no whitespace errors (diff-index)' '
 574        echo "foo();" >x &&
 575        git add x &&
 576        git diff-index --cached --check HEAD
 577'
 578
 579test_expect_success 'check staged with trailing whitespace (diff-index)' '
 580        echo "foo(); " >x &&
 581        git add x &&
 582        test_must_fail git diff-index --cached --check HEAD
 583'
 584
 585test_expect_success 'check staged with space before tab in indent (diff-index)' '
 586        # indent has space followed by hard tab
 587        echo "  foo();" >x &&
 588        git add x &&
 589        test_must_fail git diff-index --cached --check HEAD
 590'
 591
 592test_expect_success 'check with no whitespace errors (diff-tree)' '
 593        echo "foo();" >x &&
 594        git commit -m "new commit" x &&
 595        git diff-tree --check HEAD^ HEAD
 596'
 597
 598test_expect_success 'check with trailing whitespace (diff-tree)' '
 599        echo "foo(); " >x &&
 600        git commit -m "another commit" x &&
 601        test_must_fail git diff-tree --check HEAD^ HEAD
 602'
 603
 604test_expect_success 'check with space before tab in indent (diff-tree)' '
 605        # indent has space followed by hard tab
 606        echo "  foo();" >x &&
 607        git commit -m "yet another" x &&
 608        test_must_fail git diff-tree --check HEAD^ HEAD
 609'
 610
 611test_expect_success 'check trailing whitespace (trailing-space: off)' '
 612        git config core.whitespace "-trailing-space" &&
 613        echo "foo ();   " >x &&
 614        git diff --check
 615'
 616
 617test_expect_success 'check trailing whitespace (trailing-space: on)' '
 618        git config core.whitespace "trailing-space" &&
 619        echo "foo ();   " >x &&
 620        test_must_fail git diff --check
 621'
 622
 623test_expect_success 'check space before tab in indent (space-before-tab: off)' '
 624        # indent contains space followed by HT
 625        git config core.whitespace "-space-before-tab" &&
 626        echo "  foo ();" >x &&
 627        git diff --check
 628'
 629
 630test_expect_success 'check space before tab in indent (space-before-tab: on)' '
 631        # indent contains space followed by HT
 632        git config core.whitespace "space-before-tab" &&
 633        echo "  foo ();   " >x &&
 634        test_must_fail git diff --check
 635'
 636
 637test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
 638        git config core.whitespace "-indent-with-non-tab" &&
 639        echo "        foo ();" >x &&
 640        git diff --check
 641'
 642
 643test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
 644        git config core.whitespace "indent-with-non-tab" &&
 645        echo "        foo ();" >x &&
 646        test_must_fail git diff --check
 647'
 648
 649test_expect_success 'ditto, but tabwidth=9' '
 650        git config core.whitespace "indent-with-non-tab,tabwidth=9" &&
 651        git diff --check
 652'
 653
 654test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' '
 655        git config core.whitespace "indent-with-non-tab" &&
 656        echo "                  foo ();" >x &&
 657        test_must_fail git diff --check
 658'
 659
 660test_expect_success 'ditto, but tabwidth=10' '
 661        git config core.whitespace "indent-with-non-tab,tabwidth=10" &&
 662        test_must_fail git diff --check
 663'
 664
 665test_expect_success 'ditto, but tabwidth=20' '
 666        git config core.whitespace "indent-with-non-tab,tabwidth=20" &&
 667        git diff --check
 668'
 669
 670test_expect_success 'check tabs as indentation (tab-in-indent: off)' '
 671        git config core.whitespace "-tab-in-indent" &&
 672        echo "  foo ();" >x &&
 673        git diff --check
 674'
 675
 676test_expect_success 'check tabs as indentation (tab-in-indent: on)' '
 677        git config core.whitespace "tab-in-indent" &&
 678        echo "  foo ();" >x &&
 679        test_must_fail git diff --check
 680'
 681
 682test_expect_success 'check tabs and spaces as indentation (tab-in-indent: on)' '
 683        git config core.whitespace "tab-in-indent" &&
 684        echo "                  foo ();" >x &&
 685        test_must_fail git diff --check
 686'
 687
 688test_expect_success 'ditto, but tabwidth=1 (must be irrelevant)' '
 689        git config core.whitespace "tab-in-indent,tabwidth=1" &&
 690        test_must_fail git diff --check
 691'
 692
 693test_expect_success 'check tab-in-indent and indent-with-non-tab conflict' '
 694        git config core.whitespace "tab-in-indent,indent-with-non-tab" &&
 695        echo "foo ();" >x &&
 696        test_must_fail git diff --check
 697'
 698
 699test_expect_success 'check tab-in-indent excluded from wildcard whitespace attribute' '
 700        git config --unset core.whitespace &&
 701        echo "x whitespace" >.gitattributes &&
 702        echo "    foo ();" >x &&
 703        git diff --check &&
 704        rm -f .gitattributes
 705'
 706
 707test_expect_success 'line numbers in --check output are correct' '
 708        echo "" >x &&
 709        echo "foo(); " >>x &&
 710        git diff --check | grep "x:2:"
 711'
 712
 713test_expect_success 'checkdiff detects new trailing blank lines (1)' '
 714        echo "foo();" >x &&
 715        echo "" >>x &&
 716        git diff --check | grep "new blank line"
 717'
 718
 719test_expect_success 'checkdiff detects new trailing blank lines (2)' '
 720        { echo a; echo b; echo; echo; } >x &&
 721        git add x &&
 722        { echo a; echo; echo; echo; echo; } >x &&
 723        git diff --check | grep "new blank line"
 724'
 725
 726test_expect_success 'checkdiff allows new blank lines' '
 727        git checkout x &&
 728        mv x y &&
 729        (
 730                echo "/* This is new */" &&
 731                echo "" &&
 732                cat y
 733        ) >x &&
 734        git diff --check
 735'
 736
 737cat <<EOF >expect
 738EOF
 739test_expect_success 'whitespace-only changes not reported' '
 740        git reset --hard &&
 741        echo >x "hello world" &&
 742        git add x &&
 743        git commit -m "hello 1" &&
 744        echo >x "hello  world" &&
 745        git diff -b >actual &&
 746        test_cmp expect actual
 747'
 748
 749cat <<EOF >expect
 750diff --git a/x b/z
 751similarity index NUM%
 752rename from x
 753rename to z
 754index 380c32a..a97b785 100644
 755EOF
 756test_expect_success 'whitespace-only changes reported across renames' '
 757        git reset --hard &&
 758        for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x &&
 759        git add x &&
 760        git commit -m "base" &&
 761        sed -e "5s/^/ /" x >z &&
 762        git rm x &&
 763        git add z &&
 764        git diff -w -M --cached |
 765        sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" >actual &&
 766        test_cmp expect actual
 767'
 768
 769cat >expected <<\EOF
 770diff --git a/empty b/void
 771similarity index 100%
 772rename from empty
 773rename to void
 774EOF
 775
 776test_expect_success 'rename empty' '
 777        git reset --hard &&
 778        >empty &&
 779        git add empty &&
 780        git commit -m empty &&
 781        git mv empty void &&
 782        git diff -w --cached -M >current &&
 783        test_cmp expected current
 784'
 785
 786test_expect_success 'combined diff with autocrlf conversion' '
 787
 788        git reset --hard &&
 789        echo >x hello &&
 790        git commit -m "one side" x &&
 791        git checkout HEAD^ &&
 792        echo >x goodbye &&
 793        git commit -m "the other side" x &&
 794        git config core.autocrlf true &&
 795        test_must_fail git merge master &&
 796
 797        git diff | sed -e "1,/^@@@/d" >actual &&
 798        ! grep "^-" actual
 799
 800'
 801
 802# Start testing the colored format for whitespace checks
 803
 804test_expect_success 'setup diff colors' '
 805        git config color.diff always &&
 806        git config color.diff.plain normal &&
 807        git config color.diff.meta bold &&
 808        git config color.diff.frag cyan &&
 809        git config color.diff.func normal &&
 810        git config color.diff.old red &&
 811        git config color.diff.new green &&
 812        git config color.diff.commit yellow &&
 813        git config color.diff.whitespace blue &&
 814
 815        git config core.autocrlf false
 816'
 817
 818test_expect_success 'diff that introduces a line with only tabs' '
 819        git config core.whitespace blank-at-eol &&
 820        git reset --hard &&
 821        echo "test" >x &&
 822        git commit -m "initial" x &&
 823        echo "{NTN}" | tr "NT" "\n\t" >>x &&
 824        git -c color.diff=always diff | test_decode_color >current &&
 825
 826        cat >expected <<-\EOF &&
 827        <BOLD>diff --git a/x b/x<RESET>
 828        <BOLD>index 9daeafb..2874b91 100644<RESET>
 829        <BOLD>--- a/x<RESET>
 830        <BOLD>+++ b/x<RESET>
 831        <CYAN>@@ -1 +1,4 @@<RESET>
 832         test<RESET>
 833        <GREEN>+<RESET><GREEN>{<RESET>
 834        <GREEN>+<RESET><BLUE>   <RESET>
 835        <GREEN>+<RESET><GREEN>}<RESET>
 836        EOF
 837
 838        test_cmp expected current
 839'
 840
 841test_expect_success 'diff that introduces and removes ws breakages' '
 842        git reset --hard &&
 843        {
 844                echo "0. blank-at-eol " &&
 845                echo "1. blank-at-eol "
 846        } >x &&
 847        git commit -a --allow-empty -m preimage &&
 848        {
 849                echo "0. blank-at-eol " &&
 850                echo "1. still-blank-at-eol " &&
 851                echo "2. and a new line "
 852        } >x &&
 853
 854        git -c color.diff=always diff |
 855        test_decode_color >current &&
 856
 857        cat >expected <<-\EOF &&
 858        <BOLD>diff --git a/x b/x<RESET>
 859        <BOLD>index d0233a2..700886e 100644<RESET>
 860        <BOLD>--- a/x<RESET>
 861        <BOLD>+++ b/x<RESET>
 862        <CYAN>@@ -1,2 +1,3 @@<RESET>
 863         0. blank-at-eol <RESET>
 864        <RED>-1. blank-at-eol <RESET>
 865        <GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
 866        <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
 867        EOF
 868
 869        test_cmp expected current
 870'
 871
 872test_expect_success 'ws-error-highlight test setup' '
 873
 874        git reset --hard &&
 875        {
 876                echo "0. blank-at-eol " &&
 877                echo "1. blank-at-eol "
 878        } >x &&
 879        git commit -a --allow-empty -m preimage &&
 880        {
 881                echo "0. blank-at-eol " &&
 882                echo "1. still-blank-at-eol " &&
 883                echo "2. and a new line "
 884        } >x &&
 885
 886        cat >expect.default-old <<-\EOF &&
 887        <BOLD>diff --git a/x b/x<RESET>
 888        <BOLD>index d0233a2..700886e 100644<RESET>
 889        <BOLD>--- a/x<RESET>
 890        <BOLD>+++ b/x<RESET>
 891        <CYAN>@@ -1,2 +1,3 @@<RESET>
 892         0. blank-at-eol <RESET>
 893        <RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
 894        <GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
 895        <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
 896        EOF
 897
 898        cat >expect.all <<-\EOF &&
 899        <BOLD>diff --git a/x b/x<RESET>
 900        <BOLD>index d0233a2..700886e 100644<RESET>
 901        <BOLD>--- a/x<RESET>
 902        <BOLD>+++ b/x<RESET>
 903        <CYAN>@@ -1,2 +1,3 @@<RESET>
 904         <RESET>0. blank-at-eol<RESET><BLUE> <RESET>
 905        <RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
 906        <GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
 907        <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
 908        EOF
 909
 910        cat >expect.none <<-\EOF
 911        <BOLD>diff --git a/x b/x<RESET>
 912        <BOLD>index d0233a2..700886e 100644<RESET>
 913        <BOLD>--- a/x<RESET>
 914        <BOLD>+++ b/x<RESET>
 915        <CYAN>@@ -1,2 +1,3 @@<RESET>
 916         0. blank-at-eol <RESET>
 917        <RED>-1. blank-at-eol <RESET>
 918        <GREEN>+1. still-blank-at-eol <RESET>
 919        <GREEN>+2. and a new line <RESET>
 920        EOF
 921
 922'
 923
 924test_expect_success 'test --ws-error-highlight option' '
 925
 926        git -c color.diff=always diff --ws-error-highlight=default,old |
 927        test_decode_color >current &&
 928        test_cmp expect.default-old current &&
 929
 930        git -c color.diff=always diff --ws-error-highlight=all |
 931        test_decode_color >current &&
 932        test_cmp expect.all current &&
 933
 934        git -c color.diff=always diff --ws-error-highlight=none |
 935        test_decode_color >current &&
 936        test_cmp expect.none current
 937
 938'
 939
 940test_expect_success 'test diff.wsErrorHighlight config' '
 941
 942        git -c color.diff=always -c diff.wsErrorHighlight=default,old diff |
 943        test_decode_color >current &&
 944        test_cmp expect.default-old current &&
 945
 946        git -c color.diff=always -c diff.wsErrorHighlight=all diff |
 947        test_decode_color >current &&
 948        test_cmp expect.all current &&
 949
 950        git -c color.diff=always -c diff.wsErrorHighlight=none diff |
 951        test_decode_color >current &&
 952        test_cmp expect.none current
 953
 954'
 955
 956test_expect_success 'option overrides diff.wsErrorHighlight' '
 957
 958        git -c color.diff=always -c diff.wsErrorHighlight=none \
 959                diff --ws-error-highlight=default,old |
 960        test_decode_color >current &&
 961        test_cmp expect.default-old current &&
 962
 963        git -c color.diff=always -c diff.wsErrorHighlight=default \
 964                diff --ws-error-highlight=all |
 965        test_decode_color >current &&
 966        test_cmp expect.all current &&
 967
 968        git -c color.diff=always -c diff.wsErrorHighlight=all \
 969                diff --ws-error-highlight=none |
 970        test_decode_color >current &&
 971        test_cmp expect.none current
 972
 973'
 974
 975test_done