t/t4015-diff-whitespace.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Johannes E. Schindelin
   4 # Copyright (c) 2023 Google LLC
   5
   6 test_description='Test special whitespace in diff engine.
   7
   8 '
   9
  10 TEST_PASSES_SANITIZE_LEAK=true
  11 . ./test-lib.sh
  12 . "$TEST_DIRECTORY"/lib-diff.sh
  13
  14 for opt_res in --patch --quiet -s --stat --shortstat --dirstat=lines \
  15                --raw! --name-only! --name-status!
  16 do
  17         opts=${opt_res%!} expect_failure=
  18         test "$opts" = "$opt_res" ||
  19                 expect_failure="test_expect_code 1"
  20
  21         test_expect_success "status with $opts (different)" '
  22                 echo foo >x &&
  23                 git add x &&
  24                 echo bar >x &&
  25                 test_expect_code 1 git diff -w $opts --exit-code x
  26         '
  27
  28         test_expect_success POSIXPERM "status with $opts (mode differs)" '
  29                 test_when_finished "git update-index --chmod=-x x" &&
  30                 echo foo >x &&
  31                 git add x &&
  32                 git update-index --chmod=+x x &&
  33                 test_expect_code 1 git diff -w $opts --exit-code x
  34         '
  35
  36         test_expect_success "status with $opts (removing an empty file)" '
  37                 : >x &&
  38                 git add x &&
  39                 rm x &&
  40                 test_expect_code 1 git diff -w $opts --exit-code -- x
  41         '
  42
  43         test_expect_success "status with $opts (different but equivalent)" '
  44                 echo foo >x &&
  45                 git add x &&
  46                 echo " foo" >x &&
  47                 $expect_failure git diff -w $opts --exit-code x
  48         '
  49 done
  50
  51 test_expect_success "Ray Lehtiniemi's example" '
  52         cat <<-\EOF >x &&
  53         do {
  54            nothing;
  55         } while (0);
  56         EOF
  57         git update-index --add x &&
  58         old_hash_x=$(git hash-object x) &&
  59         before=$(git rev-parse --short "$old_hash_x") &&
  60
  61         cat <<-\EOF >x &&
  62         do
  63         {
  64            nothing;
  65         }
  66         while (0);
  67         EOF
  68         new_hash_x=$(git hash-object x) &&
  69         after=$(git rev-parse --short "$new_hash_x") &&
  70
  71         cat <<-EOF >expect &&
  72         diff --git a/x b/x
  73         index $before..$after 100644
  74         --- a/x
  75         +++ b/x
  76         @@ -1,3 +1,5 @@
  77         -do {
  78         +do
  79         +{
  80             nothing;
  81         -} while (0);
  82         +}
  83         +while (0);
  84         EOF
  85
  86         git diff >out &&
  87         test_cmp expect out &&
  88
  89         git diff -w >out &&
  90         test_cmp expect out &&
  91
  92         git diff -b >out &&
  93         test_cmp expect out
  94 '
  95
  96 test_expect_success 'another test, without options' '
  97         tr Q "\015" <<-\EOF >x &&
  98         whitespace at beginning
  99         whitespace change
 100         whitespace in the middle
 101         whitespace at end
 102         unchanged line
 103         CR at endQ
 104         EOF
 105
 106         git update-index x &&
 107         old_hash_x=$(git hash-object x) &&
 108         before=$(git rev-parse --short "$old_hash_x") &&
 109
 110         tr "_" " " <<-\EOF >x &&
 111         _       whitespace at beginning
 112         whitespace       change
 113         white space in the middle
 114         whitespace at end__
 115         unchanged line
 116         CR at end
 117         EOF
 118         new_hash_x=$(git hash-object x) &&
 119         after=$(git rev-parse --short "$new_hash_x") &&
 120
 121         tr "Q_" "\015 " <<-EOF >expect &&
 122         diff --git a/x b/x
 123         index $before..$after 100644
 124         --- a/x
 125         +++ b/x
 126         @@ -1,6 +1,6 @@
 127         -whitespace at beginning
 128         -whitespace change
 129         -whitespace in the middle
 130         -whitespace at end
 131         +       whitespace at beginning
 132         +whitespace      change
 133         +white space in the middle
 134         +whitespace at end__
 135          unchanged line
 136         -CR at endQ
 137         +CR at end
 138         EOF
 139
 140         git diff >out &&
 141         test_cmp expect out &&
 142
 143         git diff -w >out &&
 144         test_must_be_empty out &&
 145
 146         git diff -w -b >out &&
 147         test_must_be_empty out &&
 148
 149         git diff -w --ignore-space-at-eol >out &&
 150         test_must_be_empty out &&
 151
 152         git diff -w -b --ignore-space-at-eol >out &&
 153         test_must_be_empty out &&
 154
 155         git diff -w --ignore-cr-at-eol >out &&
 156         test_must_be_empty out &&
 157
 158         tr "Q_" "\015 " <<-EOF >expect &&
 159         diff --git a/x b/x
 160         index $before..$after 100644
 161         --- a/x
 162         +++ b/x
 163         @@ -1,6 +1,6 @@
 164         -whitespace at beginning
 165         +_      whitespace at beginning
 166          whitespace      change
 167         -whitespace in the middle
 168         +white space in the middle
 169          whitespace at end__
 170          unchanged line
 171          CR at end
 172         EOF
 173         git diff -b >out &&
 174         test_cmp expect out &&
 175
 176         git diff -b --ignore-space-at-eol >out &&
 177         test_cmp expect out &&
 178
 179         git diff -b --ignore-cr-at-eol >out &&
 180         test_cmp expect out &&
 181
 182         tr "Q_" "\015 " <<-EOF >expect &&
 183         diff --git a/x b/x
 184         index $before..$after 100644
 185         --- a/x
 186         +++ b/x
 187         @@ -1,6 +1,6 @@
 188         -whitespace at beginning
 189         -whitespace change
 190         -whitespace in the middle
 191         +_      whitespace at beginning
 192         +whitespace      change
 193         +white space in the middle
 194          whitespace at end__
 195          unchanged line
 196          CR at end
 197         EOF
 198         git diff --ignore-space-at-eol >out &&
 199         test_cmp expect out &&
 200
 201         git diff --ignore-space-at-eol --ignore-cr-at-eol >out &&
 202         test_cmp expect out &&
 203
 204         tr "Q_" "\015 " <<-EOF >expect &&
 205         diff --git a/x b/x
 206         index_$before..$after 100644
 207         --- a/x
 208         +++ b/x
 209         @@ -1,6 +1,6 @@
 210         -whitespace at beginning
 211         -whitespace change
 212         -whitespace in the middle
 213         -whitespace at end
 214         +_      whitespace at beginning
 215         +whitespace_    _change
 216         +white space in the middle
 217         +whitespace at end__
 218          unchanged line
 219          CR at end
 220         EOF
 221         git diff --ignore-cr-at-eol >out &&
 222         test_cmp expect out
 223 '
 224
 225 test_expect_success 'ignore-blank-lines: only new lines' '
 226         test_seq 5 >x &&
 227         git update-index x &&
 228         test_seq 5 | sed "/3/i\\
 229 " >x &&
 230         git diff --ignore-blank-lines >out &&
 231         test_must_be_empty out
 232 '
 233
 234 test_expect_success 'ignore-blank-lines: only new lines with space' '
 235         test_seq 5 >x &&
 236         git update-index x &&
 237         test_seq 5 | sed "/3/i\\
 238  " >x &&
 239         git diff -w --ignore-blank-lines >out &&
 240         test_must_be_empty out
 241 '
 242
 243 test_expect_success 'ignore-blank-lines: after change' '
 244         cat <<-\EOF >x &&
 245         1
 246         2
 247
 248         3
 249         4
 250         5
 251
 252         6
 253         7
 254         EOF
 255         git update-index x &&
 256         cat <<-\EOF >x &&
 257         change
 258
 259         1
 260         2
 261         3
 262         4
 263         5
 264         6
 265
 266         7
 267         EOF
 268         git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
 269         cat <<-\EOF >expected &&
 270         diff --git a/x b/x
 271         --- a/x
 272         +++ b/x
 273         @@ -1,6 +1,7 @@
 274         +change
 275         +
 276          1
 277          2
 278         -
 279          3
 280          4
 281          5
 282         EOF
 283         compare_diff_patch expected out.tmp
 284 '
 285
 286 test_expect_success 'ignore-blank-lines: before change' '
 287         cat <<-\EOF >x &&
 288         1
 289         2
 290
 291         3
 292         4
 293         5
 294         6
 295         7
 296         EOF
 297         git update-index x &&
 298         cat <<-\EOF >x &&
 299
 300         1
 301         2
 302         3
 303         4
 304         5
 305
 306         6
 307         7
 308         change
 309         EOF
 310         git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
 311         cat <<-\EOF >expected &&
 312         diff --git a/x b/x
 313         --- a/x
 314         +++ b/x
 315         @@ -4,5 +4,7 @@
 316          3
 317          4
 318          5
 319         +
 320          6
 321          7
 322         +change
 323         EOF
 324         compare_diff_patch expected out.tmp
 325 '
 326
 327 test_expect_success 'ignore-blank-lines: between changes' '
 328         cat <<-\EOF >x &&
 329         1
 330         2
 331         3
 332         4
 333         5
 334
 335
 336         6
 337         7
 338         8
 339         9
 340         10
 341         EOF
 342         git update-index x &&
 343         cat <<-\EOF >x &&
 344         change
 345         1
 346         2
 347
 348         3
 349         4
 350         5
 351         6
 352         7
 353         8
 354
 355         9
 356         10
 357         change
 358         EOF
 359         git diff --ignore-blank-lines >out.tmp &&
 360         cat <<-\EOF >expected &&
 361         diff --git a/x b/x
 362         --- a/x
 363         +++ b/x
 364         @@ -1,5 +1,7 @@
 365         +change
 366          1
 367          2
 368         +
 369          3
 370          4
 371          5
 372         @@ -8,5 +8,7 @@
 373          6
 374          7
 375          8
 376         +
 377          9
 378          10
 379         +change
 380         EOF
 381         compare_diff_patch expected out.tmp
 382 '
 383
 384 test_expect_success 'ignore-blank-lines: between changes (with interhunkctx)' '
 385         test_seq 10 >x &&
 386         git update-index x &&
 387         cat <<-\EOF >x &&
 388         change
 389         1
 390         2
 391
 392         3
 393         4
 394         5
 395
 396         6
 397         7
 398         8
 399         9
 400
 401         10
 402         change
 403         EOF
 404         git diff --inter-hunk-context=2 --ignore-blank-lines >out.tmp &&
 405         cat <<-\EOF >expected &&
 406         diff --git a/x b/x
 407         --- a/x
 408         +++ b/x
 409         @@ -1,10 +1,15 @@
 410         +change
 411          1
 412          2
 413         +
 414          3
 415          4
 416          5
 417         +
 418          6
 419          7
 420          8
 421          9
 422         +
 423          10
 424         +change
 425         EOF
 426         compare_diff_patch expected out.tmp
 427 '
 428
 429 test_expect_success 'ignore-blank-lines: scattered spaces' '
 430         test_seq 10 >x &&
 431         git update-index x &&
 432         cat <<-\EOF >x &&
 433         change
 434         1
 435         2
 436         3
 437
 438         4
 439
 440         5
 441
 442         6
 443
 444
 445         7
 446
 447         8
 448         9
 449         10
 450         change
 451         EOF
 452         git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
 453         cat <<-\EOF >expected &&
 454         diff --git a/x b/x
 455         --- a/x
 456         +++ b/x
 457         @@ -1,3 +1,4 @@
 458         +change
 459          1
 460          2
 461          3
 462         @@ -8,3 +15,4 @@
 463          8
 464          9
 465          10
 466         +change
 467         EOF
 468         compare_diff_patch expected out.tmp
 469 '
 470
 471 test_expect_success 'ignore-blank-lines: spaces coalesce' '
 472         test_seq 6 >x &&
 473         git update-index x &&
 474         cat <<-\EOF >x &&
 475         change
 476         1
 477         2
 478         3
 479
 480         4
 481
 482         5
 483
 484         6
 485         change
 486         EOF
 487         git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
 488         cat <<-\EOF >expected &&
 489         diff --git a/x b/x
 490         --- a/x
 491         +++ b/x
 492         @@ -1,6 +1,11 @@
 493         +change
 494          1
 495          2
 496          3
 497         +
 498          4
 499         +
 500          5
 501         +
 502          6
 503         +change
 504         EOF
 505         compare_diff_patch expected out.tmp
 506 '
 507
 508 test_expect_success 'ignore-blank-lines: mix changes and blank lines' '
 509         test_seq 16 >x &&
 510         git update-index x &&
 511         cat <<-\EOF >x &&
 512         change
 513         1
 514         2
 515
 516         3
 517         4
 518         5
 519         change
 520         6
 521         7
 522         8
 523
 524         9
 525         10
 526         11
 527         change
 528         12
 529         13
 530         14
 531
 532         15
 533         16
 534         change
 535         EOF
 536         git diff --ignore-blank-lines >out.tmp &&
 537         cat <<-\EOF >expected &&
 538         diff --git a/x b/x
 539         --- a/x
 540         +++ b/x
 541         @@ -1,8 +1,11 @@
 542         +change
 543          1
 544          2
 545         +
 546          3
 547          4
 548          5
 549         +change
 550          6
 551          7
 552          8
 553         @@ -9,8 +13,11 @@
 554          9
 555          10
 556          11
 557         +change
 558          12
 559          13
 560          14
 561         +
 562          15
 563          16
 564         +change
 565         EOF
 566         compare_diff_patch expected out.tmp
 567 '
 568
 569 test_expect_success 'check mixed spaces and tabs in indent' '
 570         # This is indented with SP HT SP.
 571         echo "   foo();" >x &&
 572         test_must_fail git diff --check >check &&
 573         grep "space before tab in indent" check
 574 '
 575
 576 test_expect_success 'check mixed tabs and spaces in indent' '
 577         # This is indented with HT SP HT.
 578         echo "          foo();" >x &&
 579         test_must_fail git diff --check >check &&
 580         grep "space before tab in indent" check
 581 '
 582
 583 test_expect_success 'check with no whitespace errors' '
 584         git commit -m "snapshot" &&
 585         echo "foo();" >x &&
 586         git diff --check
 587 '
 588
 589 test_expect_success 'check with trailing whitespace' '
 590         echo "foo(); " >x &&
 591         test_must_fail git diff --check
 592 '
 593
 594 test_expect_success 'check with space before tab in indent' '
 595         # indent has space followed by hard tab
 596         echo "  foo();" >x &&
 597         test_must_fail git diff --check
 598 '
 599
 600 test_expect_success '--check and --exit-code are not exclusive' '
 601         git checkout x &&
 602         git diff --check --exit-code
 603 '
 604
 605 test_expect_success '--check and --quiet are not exclusive' '
 606         git diff --check --quiet
 607 '
 608
 609 test_expect_success '-w and --exit-code interact sensibly' '
 610         test_when_finished "git checkout x" &&
 611         {
 612                 test_seq 15 &&
 613                 echo " 16"
 614         } >x &&
 615         test_must_fail git diff --exit-code &&
 616         git diff -w >actual &&
 617         test_must_be_empty actual &&
 618         git diff -w --exit-code
 619 '
 620
 621 test_expect_success '-I and --exit-code interact sensibly' '
 622         test_when_finished "git checkout x" &&
 623         {
 624                 test_seq 15 &&
 625                 echo " 16"
 626         } >x &&
 627         test_must_fail git diff --exit-code &&
 628         git diff -I. >actual &&
 629         test_must_be_empty actual &&
 630         git diff -I. --exit-code
 631 '
 632
 633 test_expect_success 'check staged with no whitespace errors' '
 634         echo "foo();" >x &&
 635         git add x &&
 636         git diff --cached --check
 637 '
 638
 639 test_expect_success 'check staged with trailing whitespace' '
 640         echo "foo(); " >x &&
 641         git add x &&
 642         test_must_fail git diff --cached --check
 643 '
 644
 645 test_expect_success 'check staged with space before tab in indent' '
 646         # indent has space followed by hard tab
 647         echo "  foo();" >x &&
 648         git add x &&
 649         test_must_fail git diff --cached --check
 650 '
 651
 652 test_expect_success 'check with no whitespace errors (diff-index)' '
 653         echo "foo();" >x &&
 654         git add x &&
 655         git diff-index --check HEAD
 656 '
 657
 658 test_expect_success 'check with trailing whitespace (diff-index)' '
 659         echo "foo(); " >x &&
 660         git add x &&
 661         test_must_fail git diff-index --check HEAD
 662 '
 663
 664 test_expect_success 'check with space before tab in indent (diff-index)' '
 665         # indent has space followed by hard tab
 666         echo "  foo();" >x &&
 667         git add x &&
 668         test_must_fail git diff-index --check HEAD
 669 '
 670
 671 test_expect_success 'check staged with no whitespace errors (diff-index)' '
 672         echo "foo();" >x &&
 673         git add x &&
 674         git diff-index --cached --check HEAD
 675 '
 676
 677 test_expect_success 'check staged with trailing whitespace (diff-index)' '
 678         echo "foo(); " >x &&
 679         git add x &&
 680         test_must_fail git diff-index --cached --check HEAD
 681 '
 682
 683 test_expect_success 'check staged with space before tab in indent (diff-index)' '
 684         # indent has space followed by hard tab
 685         echo "  foo();" >x &&
 686         git add x &&
 687         test_must_fail git diff-index --cached --check HEAD
 688 '
 689
 690 test_expect_success 'check with no whitespace errors (diff-tree)' '
 691         echo "foo();" >x &&
 692         git commit -m "new commit" x &&
 693         git diff-tree --check HEAD^ HEAD
 694 '
 695
 696 test_expect_success 'check with trailing whitespace (diff-tree)' '
 697         echo "foo(); " >x &&
 698         git commit -m "another commit" x &&
 699         test_must_fail git diff-tree --check HEAD^ HEAD
 700 '
 701
 702 test_expect_success 'check with space before tab in indent (diff-tree)' '
 703         # indent has space followed by hard tab
 704         echo "  foo();" >x &&
 705         git commit -m "yet another" x &&
 706         test_must_fail git diff-tree --check HEAD^ HEAD
 707 '
 708
 709 test_expect_success 'check with ignored trailing whitespace attr (diff-tree)' '
 710         test_when_finished "git reset --hard HEAD^" &&
 711
 712         # create a whitespace error that should be ignored
 713         echo "* -whitespace" >.gitattributes &&
 714         git add .gitattributes &&
 715         echo "foo(); " >x &&
 716         git add x &&
 717         git commit -m "add trailing space" &&
 718
 719         # with a worktree diff-tree ignores the whitespace error
 720         git diff-tree --root --check HEAD &&
 721
 722         # without a worktree diff-tree still ignores the whitespace error
 723         git -C .git diff-tree --root --check HEAD
 724 '
 725
 726 test_expect_success 'check trailing whitespace (trailing-space: off)' '
 727         git config core.whitespace "-trailing-space" &&
 728         echo "foo ();   " >x &&
 729         git diff --check
 730 '
 731
 732 test_expect_success 'check trailing whitespace (trailing-space: on)' '
 733         git config core.whitespace "trailing-space" &&
 734         echo "foo ();   " >x &&
 735         test_must_fail git diff --check
 736 '
 737
 738 test_expect_success 'check space before tab in indent (space-before-tab: off)' '
 739         # indent contains space followed by HT
 740         git config core.whitespace "-space-before-tab" &&
 741         echo "  foo ();" >x &&
 742         git diff --check
 743 '
 744
 745 test_expect_success 'check space before tab in indent (space-before-tab: on)' '
 746         # indent contains space followed by HT
 747         git config core.whitespace "space-before-tab" &&
 748         echo "  foo ();   " >x &&
 749         test_must_fail git diff --check
 750 '
 751
 752 test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
 753         git config core.whitespace "-indent-with-non-tab" &&
 754         echo "        foo ();" >x &&
 755         git diff --check
 756 '
 757
 758 test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
 759         git config core.whitespace "indent-with-non-tab" &&
 760         echo "        foo ();" >x &&
 761         test_must_fail git diff --check
 762 '
 763
 764 test_expect_success 'ditto, but tabwidth=9' '
 765         git config core.whitespace "indent-with-non-tab,tabwidth=9" &&
 766         git diff --check
 767 '
 768
 769 test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' '
 770         git config core.whitespace "indent-with-non-tab" &&
 771         echo "                  foo ();" >x &&
 772         test_must_fail git diff --check
 773 '
 774
 775 test_expect_success 'ditto, but tabwidth=10' '
 776         git config core.whitespace "indent-with-non-tab,tabwidth=10" &&
 777         test_must_fail git diff --check
 778 '
 779
 780 test_expect_success 'ditto, but tabwidth=20' '
 781         git config core.whitespace "indent-with-non-tab,tabwidth=20" &&
 782         git diff --check
 783 '
 784
 785 test_expect_success 'check tabs as indentation (tab-in-indent: off)' '
 786         git config core.whitespace "-tab-in-indent" &&
 787         echo "  foo ();" >x &&
 788         git diff --check
 789 '
 790
 791 test_expect_success 'check tabs as indentation (tab-in-indent: on)' '
 792         git config core.whitespace "tab-in-indent" &&
 793         echo "  foo ();" >x &&
 794         test_must_fail git diff --check
 795 '
 796
 797 test_expect_success 'check tabs and spaces as indentation (tab-in-indent: on)' '
 798         git config core.whitespace "tab-in-indent" &&
 799         echo "                  foo ();" >x &&
 800         test_must_fail git diff --check
 801 '
 802
 803 test_expect_success 'ditto, but tabwidth=1 (must be irrelevant)' '
 804         git config core.whitespace "tab-in-indent,tabwidth=1" &&
 805         test_must_fail git diff --check
 806 '
 807
 808 test_expect_success 'check tab-in-indent and indent-with-non-tab conflict' '
 809         git config core.whitespace "tab-in-indent,indent-with-non-tab" &&
 810         echo "foo ();" >x &&
 811         test_must_fail git diff --check
 812 '
 813
 814 test_expect_success 'check tab-in-indent excluded from wildcard whitespace attribute' '
 815         git config --unset core.whitespace &&
 816         echo "x whitespace" >.gitattributes &&
 817         echo "    foo ();" >x &&
 818         git diff --check &&
 819         rm -f .gitattributes
 820 '
 821
 822 test_expect_success 'line numbers in --check output are correct' '
 823         echo "" >x &&
 824         echo "foo(); " >>x &&
 825         test_must_fail git diff --check >check &&
 826         grep "x:2:" check
 827 '
 828
 829 test_expect_success 'checkdiff detects new trailing blank lines (1)' '
 830         echo "foo();" >x &&
 831         echo "" >>x &&
 832         test_must_fail git diff --check >check &&
 833         grep "new blank line" check
 834 '
 835
 836 test_expect_success 'checkdiff detects new trailing blank lines (2)' '
 837         test_write_lines a b "" "" >x &&
 838         git add x &&
 839         test_write_lines a "" "" "" "" >x &&
 840         test_must_fail git diff --check >check &&
 841         grep "new blank line" check
 842 '
 843
 844 test_expect_success 'checkdiff allows new blank lines' '
 845         git checkout x &&
 846         mv x y &&
 847         (
 848                 echo "/* This is new */" &&
 849                 echo "" &&
 850                 cat y
 851         ) >x &&
 852         git diff --check
 853 '
 854
 855 test_expect_success 'whitespace-only changes not reported (diff)' '
 856         git reset --hard &&
 857         echo >x "hello world" &&
 858         git add x &&
 859         git commit -m "hello 1" &&
 860         echo >x "hello  world" &&
 861         git diff -b >actual &&
 862         test_must_be_empty actual
 863 '
 864
 865 test_expect_success 'whitespace-only changes not reported (diffstat)' '
 866         # reuse state from previous test
 867         git diff --stat -b >actual &&
 868         test_must_be_empty actual
 869 '
 870
 871 test_expect_success 'whitespace changes with modification reported (diffstat)' '
 872         git reset --hard &&
 873         echo >x "hello  world" &&
 874         git update-index --chmod=+x x &&
 875         git diff --stat --cached -b >actual &&
 876         cat <<-EOF >expect &&
 877          x | 0
 878          1 file changed, 0 insertions(+), 0 deletions(-)
 879         EOF
 880         test_cmp expect actual
 881 '
 882
 883 test_expect_success 'whitespace-only changes reported across renames (diffstat)' '
 884         git reset --hard &&
 885         for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
 886         git add x &&
 887         git commit -m "base" &&
 888         sed -e "5s/^/ /" x >z &&
 889         git rm x &&
 890         git add z &&
 891         git diff -w -M --cached --stat >actual &&
 892         cat <<-EOF >expect &&
 893          x => z | 0
 894          1 file changed, 0 insertions(+), 0 deletions(-)
 895         EOF
 896         test_cmp expect actual
 897 '
 898
 899 test_expect_success 'whitespace-only changes reported across renames' '
 900         git reset --hard HEAD~1 &&
 901         for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
 902         git add x &&
 903         hash_x=$(git hash-object x) &&
 904         before=$(git rev-parse --short "$hash_x") &&
 905         git commit -m "base" &&
 906         sed -e "5s/^/ /" x >z &&
 907         git rm x &&
 908         git add z &&
 909         hash_z=$(git hash-object z) &&
 910         after=$(git rev-parse --short "$hash_z") &&
 911         git diff -w -M --cached >actual.raw &&
 912         sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" actual.raw >actual &&
 913         cat <<-EOF >expect &&
 914         diff --git a/x b/z
 915         similarity index NUM%
 916         rename from x
 917         rename to z
 918         index $before..$after 100644
 919         EOF
 920         test_cmp expect actual
 921 '
 922
 923 cat >expected <<\EOF
 924 diff --git a/empty b/void
 925 similarity index 100%
 926 rename from empty
 927 rename to void
 928 EOF
 929
 930 test_expect_success 'rename empty' '
 931         git reset --hard &&
 932         >empty &&
 933         git add empty &&
 934         git commit -m empty &&
 935         git mv empty void &&
 936         git diff -w --cached -M >current &&
 937         test_cmp expected current
 938 '
 939
 940 test_expect_success 'combined diff with autocrlf conversion' '
 941
 942         git reset --hard &&
 943         test_commit "one side" x hello one-side &&
 944         git checkout HEAD^ &&
 945         echo >x goodbye &&
 946         git commit -m "the other side" x &&
 947         git config core.autocrlf true &&
 948         test_must_fail git merge one-side >actual &&
 949         test_grep "Automatic merge failed" actual &&
 950
 951         git diff >actual.raw &&
 952         sed -e "1,/^@@@/d" actual.raw >actual &&
 953         ! grep "^-" actual
 954
 955 '
 956
 957 # Start testing the colored format for whitespace checks
 958
 959 test_expect_success 'setup diff colors' '
 960         git config color.diff.plain normal &&
 961         git config color.diff.meta bold &&
 962         git config color.diff.frag cyan &&
 963         git config color.diff.func normal &&
 964         git config color.diff.old red &&
 965         git config color.diff.new green &&
 966         git config color.diff.commit yellow &&
 967         git config color.diff.whitespace blue &&
 968
 969         git config core.autocrlf false
 970 '
 971
 972 test_expect_success 'diff that introduces a line with only tabs' '
 973         git config core.whitespace blank-at-eol &&
 974         git reset --hard &&
 975         echo "test" >x &&
 976         old_hash_x=$(git hash-object x) &&
 977         before=$(git rev-parse --short "$old_hash_x") &&
 978         git commit -m "initial" x &&
 979         echo "{NTN}" | tr "NT" "\n\t" >>x &&
 980         new_hash_x=$(git hash-object x) &&
 981         after=$(git rev-parse --short "$new_hash_x") &&
 982         git diff --color >current.raw &&
 983         test_decode_color <current.raw >current &&
 984
 985         cat >expected <<-EOF &&
 986         <BOLD>diff --git a/x b/x<RESET>
 987         <BOLD>index $before..$after 100644<RESET>
 988         <BOLD>--- a/x<RESET>
 989         <BOLD>+++ b/x<RESET>
 990         <CYAN>@@ -1 +1,4 @@<RESET>
 991          test<RESET>
 992         <GREEN>+<RESET><GREEN>{<RESET>
 993         <GREEN>+<RESET><BLUE>   <RESET>
 994         <GREEN>+<RESET><GREEN>}<RESET>
 995         EOF
 996
 997         test_cmp expected current
 998 '
 999
1000 test_expect_success 'diff that introduces and removes ws breakages' '
1001         git reset --hard &&
1002         {
1003                 echo "0. blank-at-eol " &&
1004                 echo "1. blank-at-eol "
1005         } >x &&
1006         old_hash_x=$(git hash-object x) &&
1007         before=$(git rev-parse --short "$old_hash_x") &&
1008         git commit -a --allow-empty -m preimage &&
1009         {
1010                 echo "0. blank-at-eol " &&
1011                 echo "1. still-blank-at-eol " &&
1012                 echo "2. and a new line "
1013         } >x &&
1014         new_hash_x=$(git hash-object x) &&
1015         after=$(git rev-parse --short "$new_hash_x") &&
1016
1017         git diff --color >current.raw &&
1018         test_decode_color <current.raw >current &&
1019
1020         cat >expected <<-EOF &&
1021         <BOLD>diff --git a/x b/x<RESET>
1022         <BOLD>index $before..$after 100644<RESET>
1023         <BOLD>--- a/x<RESET>
1024         <BOLD>+++ b/x<RESET>
1025         <CYAN>@@ -1,2 +1,3 @@<RESET>
1026          0. blank-at-eol <RESET>
1027         <RED>-1. blank-at-eol <RESET>
1028         <GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
1029         <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
1030         EOF
1031
1032         test_cmp expected current
1033 '
1034
1035 test_expect_success 'ws-error-highlight test setup' '
1036
1037         git reset --hard &&
1038         {
1039                 echo "0. blank-at-eol " &&
1040                 echo "1. blank-at-eol "
1041         } >x &&
1042         old_hash_x=$(git hash-object x) &&
1043         before=$(git rev-parse --short "$old_hash_x") &&
1044         git commit -a --allow-empty -m preimage &&
1045         {
1046                 echo "0. blank-at-eol " &&
1047                 echo "1. still-blank-at-eol " &&
1048                 echo "2. and a new line "
1049         } >x &&
1050         new_hash_x=$(git hash-object x) &&
1051         after=$(git rev-parse --short "$new_hash_x") &&
1052
1053         cat >expect.default-old <<-EOF &&
1054         <BOLD>diff --git a/x b/x<RESET>
1055         <BOLD>index $before..$after 100644<RESET>
1056         <BOLD>--- a/x<RESET>
1057         <BOLD>+++ b/x<RESET>
1058         <CYAN>@@ -1,2 +1,3 @@<RESET>
1059          0. blank-at-eol <RESET>
1060         <RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
1061         <GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
1062         <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
1063         EOF
1064
1065         cat >expect.all <<-EOF &&
1066         <BOLD>diff --git a/x b/x<RESET>
1067         <BOLD>index $before..$after 100644<RESET>
1068         <BOLD>--- a/x<RESET>
1069         <BOLD>+++ b/x<RESET>
1070         <CYAN>@@ -1,2 +1,3 @@<RESET>
1071          <RESET>0. blank-at-eol<RESET><BLUE> <RESET>
1072         <RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
1073         <GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
1074         <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
1075         EOF
1076
1077         cat >expect.none <<-EOF
1078         <BOLD>diff --git a/x b/x<RESET>
1079         <BOLD>index $before..$after 100644<RESET>
1080         <BOLD>--- a/x<RESET>
1081         <BOLD>+++ b/x<RESET>
1082         <CYAN>@@ -1,2 +1,3 @@<RESET>
1083          0. blank-at-eol <RESET>
1084         <RED>-1. blank-at-eol <RESET>
1085         <GREEN>+1. still-blank-at-eol <RESET>
1086         <GREEN>+2. and a new line <RESET>
1087         EOF
1088
1089 '
1090
1091 test_expect_success 'test --ws-error-highlight option' '
1092
1093         git diff --color --ws-error-highlight=default,old >current.raw &&
1094         test_decode_color <current.raw >current &&
1095         test_cmp expect.default-old current &&
1096
1097         git diff --color --ws-error-highlight=all >current.raw &&
1098         test_decode_color <current.raw >current &&
1099         test_cmp expect.all current &&
1100
1101         git diff --color --ws-error-highlight=none >current.raw &&
1102         test_decode_color <current.raw >current &&
1103         test_cmp expect.none current
1104
1105 '
1106
1107 test_expect_success 'test diff.wsErrorHighlight config' '
1108
1109         git -c diff.wsErrorHighlight=default,old diff --color >current.raw &&
1110         test_decode_color <current.raw >current &&
1111         test_cmp expect.default-old current &&
1112
1113         git -c diff.wsErrorHighlight=all diff --color >current.raw &&
1114         test_decode_color <current.raw >current &&
1115         test_cmp expect.all current &&
1116
1117         git -c diff.wsErrorHighlight=none diff --color >current.raw &&
1118         test_decode_color <current.raw >current &&
1119         test_cmp expect.none current
1120
1121 '
1122
1123 test_expect_success 'option overrides diff.wsErrorHighlight' '
1124
1125         git -c diff.wsErrorHighlight=none \
1126                 diff --color --ws-error-highlight=default,old >current.raw &&
1127         test_decode_color <current.raw >current &&
1128         test_cmp expect.default-old current &&
1129
1130         git -c diff.wsErrorHighlight=default \
1131                 diff --color --ws-error-highlight=all >current.raw &&
1132         test_decode_color <current.raw >current &&
1133         test_cmp expect.all current &&
1134
1135         git -c diff.wsErrorHighlight=all \
1136                 diff --color --ws-error-highlight=none >current.raw &&
1137         test_decode_color <current.raw >current &&
1138         test_cmp expect.none current
1139
1140 '
1141
1142 test_expect_success 'detect moved code, complete file' '
1143         git reset --hard &&
1144         cat <<-\EOF >test.c &&
1145         #include<stdio.h>
1146         main()
1147         {
1148         printf("Hello World");
1149         }
1150         EOF
1151         git add test.c &&
1152         git commit -m "add main function" &&
1153         file=$(git rev-parse --short HEAD:test.c) &&
1154         git mv test.c main.c &&
1155         test_config color.diff.oldMoved "normal red" &&
1156         test_config color.diff.newMoved "normal green" &&
1157         git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
1158         test_decode_color <actual.raw >actual &&
1159         cat >expected <<-EOF &&
1160         <BOLD>diff --git a/main.c b/main.c<RESET>
1161         <BOLD>new file mode 100644<RESET>
1162         <BOLD>index 0000000..$file<RESET>
1163         <BOLD>--- /dev/null<RESET>
1164         <BOLD>+++ b/main.c<RESET>
1165         <CYAN>@@ -0,0 +1,5 @@<RESET>
1166         <BGREEN>+<RESET><BGREEN>#include<stdio.h><RESET>
1167         <BGREEN>+<RESET><BGREEN>main()<RESET>
1168         <BGREEN>+<RESET><BGREEN>{<RESET>
1169         <BGREEN>+<RESET><BGREEN>printf("Hello World");<RESET>
1170         <BGREEN>+<RESET><BGREEN>}<RESET>
1171         <BOLD>diff --git a/test.c b/test.c<RESET>
1172         <BOLD>deleted file mode 100644<RESET>
1173         <BOLD>index $file..0000000<RESET>
1174         <BOLD>--- a/test.c<RESET>
1175         <BOLD>+++ /dev/null<RESET>
1176         <CYAN>@@ -1,5 +0,0 @@<RESET>
1177         <BRED>-#include<stdio.h><RESET>
1178         <BRED>-main()<RESET>
1179         <BRED>-{<RESET>
1180         <BRED>-printf("Hello World");<RESET>
1181         <BRED>-}<RESET>
1182         EOF
1183
1184         test_cmp expected actual
1185 '
1186
1187 test_expect_success '--color-moved with --no-ext-diff' '
1188         test_config color.diff.oldMoved "yellow" &&
1189         test_config color.diff.newMoved "blue" &&
1190         args="--color --color-moved=zebra --no-renames HEAD" &&
1191         git diff $args >expect &&
1192         git -c diff.external=echo diff --no-ext-diff $args >actual &&
1193         test_cmp expect actual
1194 '
1195
1196 test_expect_success 'detect malicious moved code, inside file' '
1197         test_config color.diff.oldMoved "normal red" &&
1198         test_config color.diff.newMoved "normal green" &&
1199         test_config color.diff.oldMovedAlternative "blue" &&
1200         test_config color.diff.newMovedAlternative "yellow" &&
1201         git reset --hard &&
1202         cat <<-\EOF >main.c &&
1203                 #include<stdio.h>
1204                 int stuff()
1205                 {
1206                         printf("Hello ");
1207                         printf("World\n");
1208                 }
1209
1210                 int secure_foo(struct user *u)
1211                 {
1212                         if (!u->is_allowed_foo)
1213                                 return;
1214                         foo(u);
1215                 }
1216
1217                 int main()
1218                 {
1219                         foo();
1220                 }
1221         EOF
1222         cat <<-\EOF >test.c &&
1223                 #include<stdio.h>
1224                 int bar()
1225                 {
1226                         printf("Hello World, but different\n");
1227                 }
1228
1229                 int another_function()
1230                 {
1231                         bar();
1232                 }
1233         EOF
1234         git add main.c test.c &&
1235         git commit -m "add main and test file" &&
1236         before_main=$(git rev-parse --short HEAD:main.c) &&
1237         before_test=$(git rev-parse --short HEAD:test.c) &&
1238         cat <<-\EOF >main.c &&
1239                 #include<stdio.h>
1240                 int stuff()
1241                 {
1242                         printf("Hello ");
1243                         printf("World\n");
1244                 }
1245
1246                 int main()
1247                 {
1248                         foo();
1249                 }
1250         EOF
1251         cat <<-\EOF >test.c &&
1252                 #include<stdio.h>
1253                 int bar()
1254                 {
1255                         printf("Hello World, but different\n");
1256                 }
1257
1258                 int secure_foo(struct user *u)
1259                 {
1260                         foo(u);
1261                         if (!u->is_allowed_foo)
1262                                 return;
1263                 }
1264
1265                 int another_function()
1266                 {
1267                         bar();
1268                 }
1269         EOF
1270         hash_main=$(git hash-object main.c) &&
1271         after_main=$(git rev-parse --short "$hash_main") &&
1272         hash_test=$(git hash-object test.c) &&
1273         after_test=$(git rev-parse --short "$hash_test") &&
1274         git diff HEAD --no-renames --color-moved=zebra --color >actual.raw &&
1275         test_decode_color <actual.raw >actual &&
1276         cat <<-EOF >expected &&
1277         <BOLD>diff --git a/main.c b/main.c<RESET>
1278         <BOLD>index $before_main..$after_main 100644<RESET>
1279         <BOLD>--- a/main.c<RESET>
1280         <BOLD>+++ b/main.c<RESET>
1281         <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
1282          printf("World\n");<RESET>
1283          }<RESET>
1284          <RESET>
1285         <BRED>-int secure_foo(struct user *u)<RESET>
1286         <BRED>-{<RESET>
1287         <BLUE>-if (!u->is_allowed_foo)<RESET>
1288         <BLUE>-return;<RESET>
1289         <RED>-foo(u);<RESET>
1290         <RED>-}<RESET>
1291         <RED>-<RESET>
1292          int main()<RESET>
1293          {<RESET>
1294          foo();<RESET>
1295         <BOLD>diff --git a/test.c b/test.c<RESET>
1296         <BOLD>index $before_test..$after_test 100644<RESET>
1297         <BOLD>--- a/test.c<RESET>
1298         <BOLD>+++ b/test.c<RESET>
1299         <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
1300          printf("Hello World, but different\n");<RESET>
1301          }<RESET>
1302          <RESET>
1303         <BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
1304         <BGREEN>+<RESET><BGREEN>{<RESET>
1305         <GREEN>+<RESET><GREEN>foo(u);<RESET>
1306         <BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
1307         <BGREEN>+<RESET><BGREEN>return;<RESET>
1308         <GREEN>+<RESET><GREEN>}<RESET>
1309         <GREEN>+<RESET>
1310          int another_function()<RESET>
1311          {<RESET>
1312          bar();<RESET>
1313         EOF
1314
1315         test_cmp expected actual
1316 '
1317
1318 test_expect_success 'plain moved code, inside file' '
1319         test_config color.diff.oldMoved "normal red" &&
1320         test_config color.diff.newMoved "normal green" &&
1321         test_config color.diff.oldMovedAlternative "blue" &&
1322         test_config color.diff.newMovedAlternative "yellow" &&
1323         # needs previous test as setup
1324         git diff HEAD --no-renames --color-moved=plain --color >actual.raw &&
1325         test_decode_color <actual.raw >actual &&
1326         cat <<-EOF >expected &&
1327         <BOLD>diff --git a/main.c b/main.c<RESET>
1328         <BOLD>index $before_main..$after_main 100644<RESET>
1329         <BOLD>--- a/main.c<RESET>
1330         <BOLD>+++ b/main.c<RESET>
1331         <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
1332          printf("World\n");<RESET>
1333          }<RESET>
1334          <RESET>
1335         <BRED>-int secure_foo(struct user *u)<RESET>
1336         <BRED>-{<RESET>
1337         <BRED>-if (!u->is_allowed_foo)<RESET>
1338         <BRED>-return;<RESET>
1339         <BRED>-foo(u);<RESET>
1340         <BRED>-}<RESET>
1341         <BRED>-<RESET>
1342          int main()<RESET>
1343          {<RESET>
1344          foo();<RESET>
1345         <BOLD>diff --git a/test.c b/test.c<RESET>
1346         <BOLD>index $before_test..$after_test 100644<RESET>
1347         <BOLD>--- a/test.c<RESET>
1348         <BOLD>+++ b/test.c<RESET>
1349         <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
1350          printf("Hello World, but different\n");<RESET>
1351          }<RESET>
1352          <RESET>
1353         <BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
1354         <BGREEN>+<RESET><BGREEN>{<RESET>
1355         <BGREEN>+<RESET><BGREEN>foo(u);<RESET>
1356         <BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
1357         <BGREEN>+<RESET><BGREEN>return;<RESET>
1358         <BGREEN>+<RESET><BGREEN>}<RESET>
1359         <BGREEN>+<RESET>
1360          int another_function()<RESET>
1361          {<RESET>
1362          bar();<RESET>
1363         EOF
1364
1365         test_cmp expected actual
1366 '
1367
1368 test_expect_success 'detect blocks of moved code' '
1369         git reset --hard &&
1370         cat <<-\EOF >lines.txt &&
1371                 long line 1
1372                 long line 2
1373                 long line 3
1374                 line 4
1375                 line 5
1376                 line 6
1377                 line 7
1378                 line 8
1379                 line 9
1380                 line 10
1381                 line 11
1382                 line 12
1383                 line 13
1384                 long line 14
1385                 long line 15
1386                 long line 16
1387         EOF
1388         git add lines.txt &&
1389         git commit -m "add poetry" &&
1390         cat <<-\EOF >lines.txt &&
1391                 line 4
1392                 line 5
1393                 line 6
1394                 line 7
1395                 line 8
1396                 line 9
1397                 long line 1
1398                 long line 2
1399                 long line 3
1400                 long line 14
1401                 long line 15
1402                 long line 16
1403                 line 10
1404                 line 11
1405                 line 12
1406                 line 13
1407         EOF
1408         test_config color.diff.oldMoved "magenta" &&
1409         test_config color.diff.newMoved "cyan" &&
1410         test_config color.diff.oldMovedAlternative "blue" &&
1411         test_config color.diff.newMovedAlternative "yellow" &&
1412         test_config color.diff.oldMovedDimmed "normal magenta" &&
1413         test_config color.diff.newMovedDimmed "normal cyan" &&
1414         test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
1415         test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
1416         git diff HEAD --no-renames --color-moved=blocks --color >actual.raw &&
1417         grep -v "index" actual.raw | test_decode_color >actual &&
1418         cat <<-\EOF >expected &&
1419         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1420         <BOLD>--- a/lines.txt<RESET>
1421         <BOLD>+++ b/lines.txt<RESET>
1422         <CYAN>@@ -1,16 +1,16 @@<RESET>
1423         <MAGENTA>-long line 1<RESET>
1424         <MAGENTA>-long line 2<RESET>
1425         <MAGENTA>-long line 3<RESET>
1426          line 4<RESET>
1427          line 5<RESET>
1428          line 6<RESET>
1429          line 7<RESET>
1430          line 8<RESET>
1431          line 9<RESET>
1432         <CYAN>+<RESET><CYAN>long line 1<RESET>
1433         <CYAN>+<RESET><CYAN>long line 2<RESET>
1434         <CYAN>+<RESET><CYAN>long line 3<RESET>
1435         <CYAN>+<RESET><CYAN>long line 14<RESET>
1436         <CYAN>+<RESET><CYAN>long line 15<RESET>
1437         <CYAN>+<RESET><CYAN>long line 16<RESET>
1438          line 10<RESET>
1439          line 11<RESET>
1440          line 12<RESET>
1441          line 13<RESET>
1442         <MAGENTA>-long line 14<RESET>
1443         <MAGENTA>-long line 15<RESET>
1444         <MAGENTA>-long line 16<RESET>
1445         EOF
1446         test_cmp expected actual
1447
1448 '
1449
1450 test_expect_success 'detect permutations inside moved code -- dimmed-zebra' '
1451         # reuse setup from test before!
1452         test_config color.diff.oldMoved "magenta" &&
1453         test_config color.diff.newMoved "cyan" &&
1454         test_config color.diff.oldMovedAlternative "blue" &&
1455         test_config color.diff.newMovedAlternative "yellow" &&
1456         test_config color.diff.oldMovedDimmed "normal magenta" &&
1457         test_config color.diff.newMovedDimmed "normal cyan" &&
1458         test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
1459         test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
1460         git diff HEAD --no-renames --color-moved=dimmed-zebra --color >actual.raw &&
1461         grep -v "index" actual.raw | test_decode_color >actual &&
1462         cat <<-\EOF >expected &&
1463         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1464         <BOLD>--- a/lines.txt<RESET>
1465         <BOLD>+++ b/lines.txt<RESET>
1466         <CYAN>@@ -1,16 +1,16 @@<RESET>
1467         <BMAGENTA>-long line 1<RESET>
1468         <BMAGENTA>-long line 2<RESET>
1469         <BMAGENTA>-long line 3<RESET>
1470          line 4<RESET>
1471          line 5<RESET>
1472          line 6<RESET>
1473          line 7<RESET>
1474          line 8<RESET>
1475          line 9<RESET>
1476         <BCYAN>+<RESET><BCYAN>long line 1<RESET>
1477         <BCYAN>+<RESET><BCYAN>long line 2<RESET>
1478         <CYAN>+<RESET><CYAN>long line 3<RESET>
1479         <YELLOW>+<RESET><YELLOW>long line 14<RESET>
1480         <BYELLOW>+<RESET><BYELLOW>long line 15<RESET>
1481         <BYELLOW>+<RESET><BYELLOW>long line 16<RESET>
1482          line 10<RESET>
1483          line 11<RESET>
1484          line 12<RESET>
1485          line 13<RESET>
1486         <BMAGENTA>-long line 14<RESET>
1487         <BMAGENTA>-long line 15<RESET>
1488         <BMAGENTA>-long line 16<RESET>
1489         EOF
1490         test_cmp expected actual
1491 '
1492
1493 test_expect_success 'zebra alternate color is only used when necessary' '
1494         cat >old.txt <<-\EOF &&
1495         line 1A should be marked as oldMoved newMovedAlternate
1496         line 1B should be marked as oldMoved newMovedAlternate
1497         unchanged
1498         line 2A should be marked as oldMoved newMovedAlternate
1499         line 2B should be marked as oldMoved newMovedAlternate
1500         line 3A should be marked as oldMovedAlternate newMoved
1501         line 3B should be marked as oldMovedAlternate newMoved
1502         unchanged
1503         line 4A should be marked as oldMoved newMovedAlternate
1504         line 4B should be marked as oldMoved newMovedAlternate
1505         line 5A should be marked as oldMovedAlternate newMoved
1506         line 5B should be marked as oldMovedAlternate newMoved
1507         line 6A should be marked as oldMoved newMoved
1508         line 6B should be marked as oldMoved newMoved
1509         EOF
1510         cat >new.txt <<-\EOF &&
1511           line 1A should be marked as oldMoved newMovedAlternate
1512           line 1B should be marked as oldMoved newMovedAlternate
1513         unchanged
1514           line 3A should be marked as oldMovedAlternate newMoved
1515           line 3B should be marked as oldMovedAlternate newMoved
1516           line 2A should be marked as oldMoved newMovedAlternate
1517           line 2B should be marked as oldMoved newMovedAlternate
1518         unchanged
1519           line 6A should be marked as oldMoved newMoved
1520           line 6B should be marked as oldMoved newMoved
1521             line 4A should be marked as oldMoved newMovedAlternate
1522             line 4B should be marked as oldMoved newMovedAlternate
1523           line 5A should be marked as oldMovedAlternate newMoved
1524           line 5B should be marked as oldMovedAlternate newMoved
1525         EOF
1526         test_expect_code 1 git diff --no-index --color --color-moved=zebra \
1527                  --color-moved-ws=allow-indentation-change \
1528                  old.txt new.txt >output &&
1529         grep -v index output | test_decode_color >actual &&
1530         cat >expected <<-\EOF &&
1531         <BOLD>diff --git a/old.txt b/new.txt<RESET>
1532         <BOLD>--- a/old.txt<RESET>
1533         <BOLD>+++ b/new.txt<RESET>
1534         <CYAN>@@ -1,14 +1,14 @@<RESET>
1535         <BOLD;MAGENTA>-line 1A should be marked as oldMoved newMovedAlternate<RESET>
1536         <BOLD;MAGENTA>-line 1B should be marked as oldMoved newMovedAlternate<RESET>
1537         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1A should be marked as oldMoved newMovedAlternate<RESET>
1538         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1B should be marked as oldMoved newMovedAlternate<RESET>
1539          unchanged<RESET>
1540         <BOLD;MAGENTA>-line 2A should be marked as oldMoved newMovedAlternate<RESET>
1541         <BOLD;MAGENTA>-line 2B should be marked as oldMoved newMovedAlternate<RESET>
1542         <BOLD;BLUE>-line 3A should be marked as oldMovedAlternate newMoved<RESET>
1543         <BOLD;BLUE>-line 3B should be marked as oldMovedAlternate newMoved<RESET>
1544         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3A should be marked as oldMovedAlternate newMoved<RESET>
1545         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3B should be marked as oldMovedAlternate newMoved<RESET>
1546         <BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2A should be marked as oldMoved newMovedAlternate<RESET>
1547         <BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2B should be marked as oldMoved newMovedAlternate<RESET>
1548          unchanged<RESET>
1549         <BOLD;MAGENTA>-line 4A should be marked as oldMoved newMovedAlternate<RESET>
1550         <BOLD;MAGENTA>-line 4B should be marked as oldMoved newMovedAlternate<RESET>
1551         <BOLD;BLUE>-line 5A should be marked as oldMovedAlternate newMoved<RESET>
1552         <BOLD;BLUE>-line 5B should be marked as oldMovedAlternate newMoved<RESET>
1553         <BOLD;MAGENTA>-line 6A should be marked as oldMoved newMoved<RESET>
1554         <BOLD;MAGENTA>-line 6B should be marked as oldMoved newMoved<RESET>
1555         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6A should be marked as oldMoved newMoved<RESET>
1556         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6B should be marked as oldMoved newMoved<RESET>
1557         <BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4A should be marked as oldMoved newMovedAlternate<RESET>
1558         <BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4B should be marked as oldMoved newMovedAlternate<RESET>
1559         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5A should be marked as oldMovedAlternate newMoved<RESET>
1560         <BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5B should be marked as oldMovedAlternate newMoved<RESET>
1561         EOF
1562         test_cmp expected actual
1563 '
1564
1565 test_expect_success 'short lines of opposite sign do not get marked as moved' '
1566         cat >old.txt <<-\EOF &&
1567         this line should be marked as moved
1568         unchanged
1569         unchanged
1570         unchanged
1571         unchanged
1572         too short
1573         this line should be marked as oldMoved newMoved
1574         this line should be marked as oldMovedAlternate newMoved
1575         unchanged 1
1576         unchanged 2
1577         unchanged 3
1578         unchanged 4
1579         this line should be marked as oldMoved newMoved/newMovedAlternate
1580         EOF
1581         cat >new.txt <<-\EOF &&
1582         too short
1583         unchanged
1584         unchanged
1585         this line should be marked as moved
1586         too short
1587         unchanged
1588         unchanged
1589         this line should be marked as oldMoved newMoved/newMovedAlternate
1590         unchanged 1
1591         unchanged 2
1592         this line should be marked as oldMovedAlternate newMoved
1593         this line should be marked as oldMoved newMoved/newMovedAlternate
1594         unchanged 3
1595         this line should be marked as oldMoved newMoved
1596         unchanged 4
1597         EOF
1598         test_expect_code 1 git diff --no-index --color --color-moved=zebra \
1599                 old.txt new.txt >output && cat output &&
1600         grep -v index output | test_decode_color >actual &&
1601         cat >expect <<-\EOF &&
1602         <BOLD>diff --git a/old.txt b/new.txt<RESET>
1603         <BOLD>--- a/old.txt<RESET>
1604         <BOLD>+++ b/new.txt<RESET>
1605         <CYAN>@@ -1,13 +1,15 @@<RESET>
1606         <BOLD;MAGENTA>-this line should be marked as moved<RESET>
1607         <GREEN>+<RESET><GREEN>too short<RESET>
1608          unchanged<RESET>
1609          unchanged<RESET>
1610         <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as moved<RESET>
1611         <GREEN>+<RESET><GREEN>too short<RESET>
1612          unchanged<RESET>
1613          unchanged<RESET>
1614         <RED>-too short<RESET>
1615         <BOLD;MAGENTA>-this line should be marked as oldMoved newMoved<RESET>
1616         <BOLD;BLUE>-this line should be marked as oldMovedAlternate newMoved<RESET>
1617         <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
1618          unchanged 1<RESET>
1619          unchanged 2<RESET>
1620         <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMovedAlternate newMoved<RESET>
1621         <BOLD;YELLOW>+<RESET><BOLD;YELLOW>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
1622          unchanged 3<RESET>
1623         <BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved<RESET>
1624          unchanged 4<RESET>
1625         <BOLD;MAGENTA>-this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
1626         EOF
1627         test_cmp expect actual
1628 '
1629
1630 test_expect_success 'cmd option assumes configured colored-moved' '
1631         test_config color.diff.oldMoved "magenta" &&
1632         test_config color.diff.newMoved "cyan" &&
1633         test_config color.diff.oldMovedAlternative "blue" &&
1634         test_config color.diff.newMovedAlternative "yellow" &&
1635         test_config color.diff.oldMovedDimmed "normal magenta" &&
1636         test_config color.diff.newMovedDimmed "normal cyan" &&
1637         test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
1638         test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
1639         test_config diff.colorMoved zebra &&
1640         git diff HEAD --no-renames --color-moved --color >actual.raw &&
1641         grep -v "index" actual.raw | test_decode_color >actual &&
1642         cat <<-\EOF >expected &&
1643         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1644         <BOLD>--- a/lines.txt<RESET>
1645         <BOLD>+++ b/lines.txt<RESET>
1646         <CYAN>@@ -1,16 +1,16 @@<RESET>
1647         <MAGENTA>-long line 1<RESET>
1648         <MAGENTA>-long line 2<RESET>
1649         <MAGENTA>-long line 3<RESET>
1650          line 4<RESET>
1651          line 5<RESET>
1652          line 6<RESET>
1653          line 7<RESET>
1654          line 8<RESET>
1655          line 9<RESET>
1656         <CYAN>+<RESET><CYAN>long line 1<RESET>
1657         <CYAN>+<RESET><CYAN>long line 2<RESET>
1658         <CYAN>+<RESET><CYAN>long line 3<RESET>
1659         <YELLOW>+<RESET><YELLOW>long line 14<RESET>
1660         <YELLOW>+<RESET><YELLOW>long line 15<RESET>
1661         <YELLOW>+<RESET><YELLOW>long line 16<RESET>
1662          line 10<RESET>
1663          line 11<RESET>
1664          line 12<RESET>
1665          line 13<RESET>
1666         <MAGENTA>-long line 14<RESET>
1667         <MAGENTA>-long line 15<RESET>
1668         <MAGENTA>-long line 16<RESET>
1669         EOF
1670         test_cmp expected actual
1671 '
1672
1673 test_expect_success 'no effect on diff from --color-moved with --word-diff' '
1674         cat <<-\EOF >text.txt &&
1675         Lorem Ipsum is simply dummy text of the printing and typesetting industry.
1676         EOF
1677         git add text.txt &&
1678         git commit -a -m "clean state" &&
1679         cat <<-\EOF >text.txt &&
1680         simply Lorem Ipsum dummy is text of the typesetting and printing industry.
1681         EOF
1682         git diff --color-moved --word-diff >actual &&
1683         git diff --word-diff >expect &&
1684         test_cmp expect actual
1685 '
1686
1687 test_expect_success 'no effect on show from --color-moved with --word-diff' '
1688         git show --color-moved --word-diff >actual &&
1689         git show --word-diff >expect &&
1690         test_cmp expect actual
1691 '
1692
1693 test_expect_success 'set up whitespace tests' '
1694         git reset --hard &&
1695         # Note that these lines have no leading or trailing whitespace.
1696         cat <<-\EOF >lines.txt &&
1697         line 1
1698         line 2
1699         line 3
1700         line 4
1701         line 5
1702         long line 6
1703         long line 7
1704         long line 8
1705         long line 9
1706         EOF
1707         git add lines.txt &&
1708         git commit -m "add poetry" &&
1709         git config color.diff.oldMoved "magenta" &&
1710         git config color.diff.newMoved "cyan"
1711 '
1712
1713 test_expect_success 'move detection ignoring whitespace ' '
1714         q_to_tab <<-\EOF >lines.txt &&
1715         Qlong line 6
1716         Qlong line 7
1717         Qlong line 8
1718         Qchanged long line 9
1719         line 1
1720         line 2
1721         line 3
1722         line 4
1723         line 5
1724         EOF
1725         git diff HEAD --no-renames --color-moved --color >actual.raw &&
1726         grep -v "index" actual.raw | test_decode_color >actual &&
1727         cat <<-\EOF >expected &&
1728         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1729         <BOLD>--- a/lines.txt<RESET>
1730         <BOLD>+++ b/lines.txt<RESET>
1731         <CYAN>@@ -1,9 +1,9 @@<RESET>
1732         <GREEN>+<RESET> <GREEN>long line 6<RESET>
1733         <GREEN>+<RESET> <GREEN>long line 7<RESET>
1734         <GREEN>+<RESET> <GREEN>long line 8<RESET>
1735         <GREEN>+<RESET> <GREEN>changed long line 9<RESET>
1736          line 1<RESET>
1737          line 2<RESET>
1738          line 3<RESET>
1739          line 4<RESET>
1740          line 5<RESET>
1741         <RED>-long line 6<RESET>
1742         <RED>-long line 7<RESET>
1743         <RED>-long line 8<RESET>
1744         <RED>-long line 9<RESET>
1745         EOF
1746         test_cmp expected actual &&
1747
1748         git diff HEAD --no-renames --color-moved --color \
1749                 --color-moved-ws=ignore-all-space >actual.raw &&
1750         grep -v "index" actual.raw | test_decode_color >actual &&
1751         cat <<-\EOF >expected &&
1752         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1753         <BOLD>--- a/lines.txt<RESET>
1754         <BOLD>+++ b/lines.txt<RESET>
1755         <CYAN>@@ -1,9 +1,9 @@<RESET>
1756         <CYAN>+<RESET>  <CYAN>long line 6<RESET>
1757         <CYAN>+<RESET>  <CYAN>long line 7<RESET>
1758         <CYAN>+<RESET>  <CYAN>long line 8<RESET>
1759         <GREEN>+<RESET> <GREEN>changed long line 9<RESET>
1760          line 1<RESET>
1761          line 2<RESET>
1762          line 3<RESET>
1763          line 4<RESET>
1764          line 5<RESET>
1765         <MAGENTA>-long line 6<RESET>
1766         <MAGENTA>-long line 7<RESET>
1767         <MAGENTA>-long line 8<RESET>
1768         <RED>-long line 9<RESET>
1769         EOF
1770         test_cmp expected actual
1771 '
1772
1773 test_expect_success 'move detection ignoring whitespace changes' '
1774         git reset --hard &&
1775         # Lines 6-8 have a space change, but 9 is new whitespace
1776         q_to_tab <<-\EOF >lines.txt &&
1777         longQline 6
1778         longQline 7
1779         longQline 8
1780         long liQne 9
1781         line 1
1782         line 2
1783         line 3
1784         line 4
1785         line 5
1786         EOF
1787
1788         git diff HEAD --no-renames --color-moved --color >actual.raw &&
1789         grep -v "index" actual.raw | test_decode_color >actual &&
1790         cat <<-\EOF >expected &&
1791         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1792         <BOLD>--- a/lines.txt<RESET>
1793         <BOLD>+++ b/lines.txt<RESET>
1794         <CYAN>@@ -1,9 +1,9 @@<RESET>
1795         <GREEN>+<RESET><GREEN>long      line 6<RESET>
1796         <GREEN>+<RESET><GREEN>long      line 7<RESET>
1797         <GREEN>+<RESET><GREEN>long      line 8<RESET>
1798         <GREEN>+<RESET><GREEN>long li   ne 9<RESET>
1799          line 1<RESET>
1800          line 2<RESET>
1801          line 3<RESET>
1802          line 4<RESET>
1803          line 5<RESET>
1804         <RED>-long line 6<RESET>
1805         <RED>-long line 7<RESET>
1806         <RED>-long line 8<RESET>
1807         <RED>-long line 9<RESET>
1808         EOF
1809         test_cmp expected actual &&
1810
1811         git diff HEAD --no-renames --color-moved --color \
1812                 --color-moved-ws=ignore-space-change >actual.raw &&
1813         grep -v "index" actual.raw | test_decode_color >actual &&
1814         cat <<-\EOF >expected &&
1815         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1816         <BOLD>--- a/lines.txt<RESET>
1817         <BOLD>+++ b/lines.txt<RESET>
1818         <CYAN>@@ -1,9 +1,9 @@<RESET>
1819         <CYAN>+<RESET><CYAN>long        line 6<RESET>
1820         <CYAN>+<RESET><CYAN>long        line 7<RESET>
1821         <CYAN>+<RESET><CYAN>long        line 8<RESET>
1822         <GREEN>+<RESET><GREEN>long li   ne 9<RESET>
1823          line 1<RESET>
1824          line 2<RESET>
1825          line 3<RESET>
1826          line 4<RESET>
1827          line 5<RESET>
1828         <MAGENTA>-long line 6<RESET>
1829         <MAGENTA>-long line 7<RESET>
1830         <MAGENTA>-long line 8<RESET>
1831         <RED>-long line 9<RESET>
1832         EOF
1833         test_cmp expected actual
1834 '
1835
1836 test_expect_success 'move detection ignoring whitespace at eol' '
1837         git reset --hard &&
1838         # Lines 6-9 have new eol whitespace, but 9 also has it in the middle
1839         q_to_tab <<-\EOF >lines.txt &&
1840         long line 6Q
1841         long line 7Q
1842         long line 8Q
1843         longQline 9Q
1844         line 1
1845         line 2
1846         line 3
1847         line 4
1848         line 5
1849         EOF
1850
1851         # avoid cluttering the output with complaints about our eol whitespace
1852         test_config core.whitespace -blank-at-eol &&
1853
1854         git diff HEAD --no-renames --color-moved --color >actual.raw &&
1855         grep -v "index" actual.raw | test_decode_color >actual &&
1856         cat <<-\EOF >expected &&
1857         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1858         <BOLD>--- a/lines.txt<RESET>
1859         <BOLD>+++ b/lines.txt<RESET>
1860         <CYAN>@@ -1,9 +1,9 @@<RESET>
1861         <GREEN>+<RESET><GREEN>long line 6       <RESET>
1862         <GREEN>+<RESET><GREEN>long line 7       <RESET>
1863         <GREEN>+<RESET><GREEN>long line 8       <RESET>
1864         <GREEN>+<RESET><GREEN>long      line 9  <RESET>
1865          line 1<RESET>
1866          line 2<RESET>
1867          line 3<RESET>
1868          line 4<RESET>
1869          line 5<RESET>
1870         <RED>-long line 6<RESET>
1871         <RED>-long line 7<RESET>
1872         <RED>-long line 8<RESET>
1873         <RED>-long line 9<RESET>
1874         EOF
1875         test_cmp expected actual &&
1876
1877         git diff HEAD --no-renames --color-moved --color \
1878                 --color-moved-ws=ignore-space-at-eol >actual.raw &&
1879         grep -v "index" actual.raw | test_decode_color >actual &&
1880         cat <<-\EOF >expected &&
1881         <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
1882         <BOLD>--- a/lines.txt<RESET>
1883         <BOLD>+++ b/lines.txt<RESET>
1884         <CYAN>@@ -1,9 +1,9 @@<RESET>
1885         <CYAN>+<RESET><CYAN>long line 6 <RESET>
1886         <CYAN>+<RESET><CYAN>long line 7 <RESET>
1887         <CYAN>+<RESET><CYAN>long line 8 <RESET>
1888         <GREEN>+<RESET><GREEN>long      line 9  <RESET>
1889          line 1<RESET>
1890          line 2<RESET>
1891          line 3<RESET>
1892          line 4<RESET>
1893          line 5<RESET>
1894         <MAGENTA>-long line 6<RESET>
1895         <MAGENTA>-long line 7<RESET>
1896         <MAGENTA>-long line 8<RESET>
1897         <RED>-long line 9<RESET>
1898         EOF
1899         test_cmp expected actual
1900 '
1901
1902 test_expect_success 'clean up whitespace-test colors' '
1903         git config --unset color.diff.oldMoved &&
1904         git config --unset color.diff.newMoved
1905 '
1906
1907 test_expect_success '--color-moved block at end of diff output respects MIN_ALNUM_COUNT' '
1908         git reset --hard &&
1909         >bar &&
1910         cat <<-\EOF >foo &&
1911         irrelevant_line
1912         line1
1913         EOF
1914         git add foo bar &&
1915         git commit -m x &&
1916
1917         cat <<-\EOF >bar &&
1918         line1
1919         EOF
1920         cat <<-\EOF >foo &&
1921         irrelevant_line
1922         EOF
1923
1924         git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
1925         grep -v "index" actual.raw | test_decode_color >actual &&
1926         cat >expected <<-\EOF &&
1927         <BOLD>diff --git a/bar b/bar<RESET>
1928         <BOLD>--- a/bar<RESET>
1929         <BOLD>+++ b/bar<RESET>
1930         <CYAN>@@ -0,0 +1 @@<RESET>
1931         <GREEN>+<RESET><GREEN>line1<RESET>
1932         <BOLD>diff --git a/foo b/foo<RESET>
1933         <BOLD>--- a/foo<RESET>
1934         <BOLD>+++ b/foo<RESET>
1935         <CYAN>@@ -1,2 +1 @@<RESET>
1936          irrelevant_line<RESET>
1937         <RED>-line1<RESET>
1938         EOF
1939
1940         test_cmp expected actual
1941 '
1942
1943 test_expect_success '--color-moved respects MIN_ALNUM_COUNT' '
1944         git reset --hard &&
1945         cat <<-\EOF >foo &&
1946         nineteen chars 456789
1947         irrelevant_line
1948         twenty chars 234567890
1949         EOF
1950         >bar &&
1951         git add foo bar &&
1952         git commit -m x &&
1953
1954         cat <<-\EOF >foo &&
1955         irrelevant_line
1956         EOF
1957         cat <<-\EOF >bar &&
1958         twenty chars 234567890
1959         nineteen chars 456789
1960         EOF
1961
1962         git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
1963         grep -v "index" actual.raw | test_decode_color >actual &&
1964         cat >expected <<-\EOF &&
1965         <BOLD>diff --git a/bar b/bar<RESET>
1966         <BOLD>--- a/bar<RESET>
1967         <BOLD>+++ b/bar<RESET>
1968         <CYAN>@@ -0,0 +1,2 @@<RESET>
1969         <BOLD;CYAN>+<RESET><BOLD;CYAN>twenty chars 234567890<RESET>
1970         <GREEN>+<RESET><GREEN>nineteen chars 456789<RESET>
1971         <BOLD>diff --git a/foo b/foo<RESET>
1972         <BOLD>--- a/foo<RESET>
1973         <BOLD>+++ b/foo<RESET>
1974         <CYAN>@@ -1,3 +1 @@<RESET>
1975         <RED>-nineteen chars 456789<RESET>
1976          irrelevant_line<RESET>
1977         <BOLD;MAGENTA>-twenty chars 234567890<RESET>
1978         EOF
1979
1980         test_cmp expected actual
1981 '
1982
1983 test_expect_success '--color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT' '
1984         git reset --hard &&
1985         cat <<-\EOF >foo &&
1986         7charsA
1987         irrelevant_line
1988         7charsB
1989         7charsC
1990         EOF
1991         >bar &&
1992         git add foo bar &&
1993         git commit -m x &&
1994
1995         cat <<-\EOF >foo &&
1996         irrelevant_line
1997         EOF
1998         cat <<-\EOF >bar &&
1999         7charsB
2000         7charsC
2001         7charsA
2002         EOF
2003
2004         git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
2005         grep -v "index" actual.raw | test_decode_color >actual &&
2006         cat >expected <<-\EOF &&
2007         <BOLD>diff --git a/bar b/bar<RESET>
2008         <BOLD>--- a/bar<RESET>
2009         <BOLD>+++ b/bar<RESET>
2010         <CYAN>@@ -0,0 +1,3 @@<RESET>
2011         <GREEN>+<RESET><GREEN>7charsB<RESET>
2012         <GREEN>+<RESET><GREEN>7charsC<RESET>
2013         <GREEN>+<RESET><GREEN>7charsA<RESET>
2014         <BOLD>diff --git a/foo b/foo<RESET>
2015         <BOLD>--- a/foo<RESET>
2016         <BOLD>+++ b/foo<RESET>
2017         <CYAN>@@ -1,4 +1 @@<RESET>
2018         <RED>-7charsA<RESET>
2019          irrelevant_line<RESET>
2020         <RED>-7charsB<RESET>
2021         <RED>-7charsC<RESET>
2022         EOF
2023
2024         test_cmp expected actual
2025 '
2026
2027 test_expect_success '--color-moved rewinds for MIN_ALNUM_COUNT' '
2028         git reset --hard &&
2029         test_write_lines >file \
2030                 A B C one two three four five six seven D E F G H I J &&
2031         git add file &&
2032         test_write_lines >file \
2033                 one two A B C D E F G H I J two three four five six seven &&
2034         git diff --color-moved=zebra -- file &&
2035
2036         git diff --color-moved=zebra --color -- file >actual.raw &&
2037         grep -v "index" actual.raw | test_decode_color >actual &&
2038         cat >expected <<-\EOF &&
2039         <BOLD>diff --git a/file b/file<RESET>
2040         <BOLD>--- a/file<RESET>
2041         <BOLD>+++ b/file<RESET>
2042         <CYAN>@@ -1,13 +1,8 @@<RESET>
2043         <GREEN>+<RESET><GREEN>one<RESET>
2044         <GREEN>+<RESET><GREEN>two<RESET>
2045          A<RESET>
2046          B<RESET>
2047          C<RESET>
2048         <RED>-one<RESET>
2049         <BOLD;MAGENTA>-two<RESET>
2050         <BOLD;MAGENTA>-three<RESET>
2051         <BOLD;MAGENTA>-four<RESET>
2052         <BOLD;MAGENTA>-five<RESET>
2053         <BOLD;MAGENTA>-six<RESET>
2054         <BOLD;MAGENTA>-seven<RESET>
2055          D<RESET>
2056          E<RESET>
2057          F<RESET>
2058         <CYAN>@@ -15,3 +10,9 @@<RESET> <RESET>G<RESET>
2059          H<RESET>
2060          I<RESET>
2061          J<RESET>
2062         <BOLD;CYAN>+<RESET><BOLD;CYAN>two<RESET>
2063         <BOLD;CYAN>+<RESET><BOLD;CYAN>three<RESET>
2064         <BOLD;CYAN>+<RESET><BOLD;CYAN>four<RESET>
2065         <BOLD;CYAN>+<RESET><BOLD;CYAN>five<RESET>
2066         <BOLD;CYAN>+<RESET><BOLD;CYAN>six<RESET>
2067         <BOLD;CYAN>+<RESET><BOLD;CYAN>seven<RESET>
2068         EOF
2069
2070         test_cmp expected actual
2071 '
2072
2073 test_expect_success 'move detection with submodules' '
2074         test_create_repo bananas &&
2075         echo ripe >bananas/recipe &&
2076         git -C bananas add recipe &&
2077         test_commit fruit &&
2078         test_commit -C bananas recipe &&
2079         git submodule add ./bananas &&
2080         git add bananas &&
2081         git commit -a -m "bananas are like a heavy library?" &&
2082         echo foul >bananas/recipe &&
2083         echo ripe >fruit.t &&
2084
2085         git diff --submodule=diff --color-moved --color >actual &&
2086
2087         # no move detection as the moved line is across repository boundaries.
2088         test_decode_color <actual >decoded_actual &&
2089         ! grep BGREEN decoded_actual &&
2090         ! grep BRED decoded_actual &&
2091
2092         # nor did we mess with it another way
2093         git diff --submodule=diff --color >expect.raw &&
2094         test_decode_color <expect.raw >expect &&
2095         test_cmp expect decoded_actual &&
2096         rm -rf bananas &&
2097         git submodule deinit bananas
2098 '
2099
2100 test_expect_success 'only move detection ignores white spaces' '
2101         git reset --hard &&
2102         q_to_tab <<-\EOF >text.txt &&
2103                 a long line to exceed per-line minimum
2104                 another long line to exceed per-line minimum
2105                 original file
2106         EOF
2107         git add text.txt &&
2108         git commit -m "add text" &&
2109         q_to_tab <<-\EOF >text.txt &&
2110                 Qa long line to exceed per-line minimum
2111                 Qanother long line to exceed per-line minimum
2112                 new file
2113         EOF
2114
2115         # Make sure we get a different diff using -w
2116         git diff --color --color-moved -w >actual.raw &&
2117         grep -v "index" actual.raw | test_decode_color >actual &&
2118         q_to_tab <<-\EOF >expected &&
2119         <BOLD>diff --git a/text.txt b/text.txt<RESET>
2120         <BOLD>--- a/text.txt<RESET>
2121         <BOLD>+++ b/text.txt<RESET>
2122         <CYAN>@@ -1,3 +1,3 @@<RESET>
2123          Qa long line to exceed per-line minimum<RESET>
2124          Qanother long line to exceed per-line minimum<RESET>
2125         <RED>-original file<RESET>
2126         <GREEN>+<RESET><GREEN>new file<RESET>
2127         EOF
2128         test_cmp expected actual &&
2129
2130         # And now ignoring white space only in the move detection
2131         git diff --color --color-moved \
2132                 --color-moved-ws=ignore-all-space,ignore-space-change,ignore-space-at-eol >actual.raw &&
2133         grep -v "index" actual.raw | test_decode_color >actual &&
2134         q_to_tab <<-\EOF >expected &&
2135         <BOLD>diff --git a/text.txt b/text.txt<RESET>
2136         <BOLD>--- a/text.txt<RESET>
2137         <BOLD>+++ b/text.txt<RESET>
2138         <CYAN>@@ -1,3 +1,3 @@<RESET>
2139         <BOLD;MAGENTA>-a long line to exceed per-line minimum<RESET>
2140         <BOLD;MAGENTA>-another long line to exceed per-line minimum<RESET>
2141         <RED>-original file<RESET>
2142         <BOLD;CYAN>+<RESET>Q<BOLD;CYAN>a long line to exceed per-line minimum<RESET>
2143         <BOLD;CYAN>+<RESET>Q<BOLD;CYAN>another long line to exceed per-line minimum<RESET>
2144         <GREEN>+<RESET><GREEN>new file<RESET>
2145         EOF
2146         test_cmp expected actual
2147 '
2148
2149 test_expect_success 'compare whitespace delta across moved blocks' '
2150
2151         git reset --hard &&
2152         q_to_tab <<-\EOF >text.txt &&
2153         QIndented
2154         QText across
2155         Qsome lines
2156         QBut! <- this stands out
2157         QAdjusting with
2158         QQdifferent starting
2159         Qwhite spaces
2160         QAnother outlier
2161         QQQIndented
2162         QQQText across
2163         QQQfive lines
2164         QQQthat has similar lines
2165         QQQto previous blocks, but with different indent
2166         QQQYetQAnotherQoutlierQ
2167         QLine with internal w h i t e s p a c e change
2168         EOF
2169
2170         git add text.txt &&
2171         git commit -m "add text.txt" &&
2172
2173         q_to_tab <<-\EOF >text.txt &&
2174         QQIndented
2175         QQText across
2176         QQsome lines
2177         QQQBut! <- this stands out
2178         Adjusting with
2179         Qdifferent starting
2180         white spaces
2181         AnotherQoutlier
2182         QQIndented
2183         QQText across
2184         QQfive lines
2185         QQthat has similar lines
2186         QQto previous blocks, but with different indent
2187         QQYetQAnotherQoutlier
2188         QLine with internal whitespace change
2189         EOF
2190
2191         git diff --color --color-moved --color-moved-ws=allow-indentation-change >actual.raw &&
2192         grep -v "index" actual.raw | test_decode_color >actual &&
2193
2194         q_to_tab <<-\EOF >expected &&
2195                 <BOLD>diff --git a/text.txt b/text.txt<RESET>
2196                 <BOLD>--- a/text.txt<RESET>
2197                 <BOLD>+++ b/text.txt<RESET>
2198                 <CYAN>@@ -1,15 +1,15 @@<RESET>
2199                 <BOLD;MAGENTA>-QIndented<RESET>
2200                 <BOLD;MAGENTA>-QText across<RESET>
2201                 <BOLD;MAGENTA>-Qsome lines<RESET>
2202                 <RED>-QBut! <- this stands out<RESET>
2203                 <BOLD;MAGENTA>-QAdjusting with<RESET>
2204                 <BOLD;MAGENTA>-QQdifferent starting<RESET>
2205                 <BOLD;MAGENTA>-Qwhite spaces<RESET>
2206                 <RED>-QAnother outlier<RESET>
2207                 <BOLD;MAGENTA>-QQQIndented<RESET>
2208                 <BOLD;MAGENTA>-QQQText across<RESET>
2209                 <BOLD;MAGENTA>-QQQfive lines<RESET>
2210                 <BOLD;MAGENTA>-QQQthat has similar lines<RESET>
2211                 <BOLD;MAGENTA>-QQQto previous blocks, but with different indent<RESET>
2212                 <RED>-QQQYetQAnotherQoutlierQ<RESET>
2213                 <RED>-QLine with internal w h i t e s p a c e change<RESET>
2214                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Indented<RESET>
2215                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Text across<RESET>
2216                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>some lines<RESET>
2217                 <GREEN>+<RESET>QQQ<GREEN>But! <- this stands out<RESET>
2218                 <BOLD;CYAN>+<RESET><BOLD;CYAN>Adjusting with<RESET>
2219                 <BOLD;CYAN>+<RESET>Q<BOLD;CYAN>different starting<RESET>
2220                 <BOLD;CYAN>+<RESET><BOLD;CYAN>white spaces<RESET>
2221                 <GREEN>+<RESET><GREEN>AnotherQoutlier<RESET>
2222                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Indented<RESET>
2223                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Text across<RESET>
2224                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>five lines<RESET>
2225                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>that has similar lines<RESET>
2226                 <BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>to previous blocks, but with different indent<RESET>
2227                 <GREEN>+<RESET>QQ<GREEN>YetQAnotherQoutlier<RESET>
2228                 <GREEN>+<RESET>Q<GREEN>Line with internal whitespace change<RESET>
2229         EOF
2230
2231         test_cmp expected actual
2232 '
2233
2234 test_expect_success 'bogus settings in move detection erroring out' '
2235         test_must_fail git diff --color-moved=bogus 2>err &&
2236         test_grep "must be one of" err &&
2237         test_grep bogus err &&
2238
2239         test_must_fail git -c diff.colormoved=bogus diff 2>err &&
2240         test_grep "must be one of" err &&
2241         test_grep "from command-line config" err &&
2242
2243         test_must_fail git diff --color-moved-ws=bogus 2>err &&
2244         test_grep "possible values" err &&
2245         test_grep bogus err &&
2246
2247         test_must_fail git -c diff.colormovedws=bogus diff 2>err &&
2248         test_grep "possible values" err &&
2249         test_grep "from command-line config" err
2250 '
2251
2252 test_expect_success 'compare whitespace delta incompatible with other space options' '
2253         test_must_fail git diff \
2254                 --color-moved-ws=allow-indentation-change,ignore-all-space \
2255                 2>err &&
2256         test_grep allow-indentation-change err
2257 '
2258
2259 EMPTY=''
2260 test_expect_success 'compare mixed whitespace delta across moved blocks' '
2261
2262         git reset --hard &&
2263         tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
2264         ^__
2265         |____too short without
2266         ^
2267         ___being grouped across blank line
2268         ${EMPTY}
2269         context
2270         lines
2271         to
2272         anchor
2273         ____Indented text to
2274         _Q____be further indented by four spaces across
2275         ____Qseveral lines
2276         QQ____These two lines have had their
2277         ____indentation reduced by four spaces
2278         Qdifferent indentation change
2279         ____too short
2280         EOF
2281
2282         git add text.txt &&
2283         git commit -m "add text.txt" &&
2284
2285         tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
2286         context
2287         lines
2288         to
2289         anchor
2290         QIndented text to
2291         QQbe further indented by four spaces across
2292         Q____several lines
2293         ${EMPTY}
2294         QQtoo short without
2295         ${EMPTY}
2296         ^Q_______being grouped across blank line
2297         ${EMPTY}
2298         Q_QThese two lines have had their
2299         indentation reduced by four spaces
2300         QQdifferent indentation change
2301         __Qtoo short
2302         EOF
2303
2304         git -c color.diff.whitespace="normal red" \
2305                 -c core.whitespace=space-before-tab \
2306                 diff --color --color-moved --ws-error-highlight=all \
2307                 --color-moved-ws=allow-indentation-change >actual.raw &&
2308         grep -v "index" actual.raw | tr "\f\v" "^|" | test_decode_color >actual &&
2309
2310         cat <<-\EOF >expected &&
2311         <BOLD>diff --git a/text.txt b/text.txt<RESET>
2312         <BOLD>--- a/text.txt<RESET>
2313         <BOLD>+++ b/text.txt<RESET>
2314         <CYAN>@@ -1,16 +1,16 @@<RESET>
2315         <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET><BRED>  <RESET>
2316         <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>|    too short without<RESET>
2317         <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET>
2318         <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>   being grouped across blank line<RESET>
2319         <BOLD;MAGENTA>-<RESET>
2320          <RESET>context<RESET>
2321          <RESET>lines<RESET>
2322          <RESET>to<RESET>
2323          <RESET>anchor<RESET>
2324         <BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>    Indented text to<RESET>
2325         <BOLD;MAGENTA>-<RESET><BRED> <RESET>    <BOLD;MAGENTA>    be further indented by four spaces across<RESET>
2326         <BOLD;MAGENTA>-<RESET><BRED>    <RESET> <BOLD;MAGENTA>several lines<RESET>
2327         <BOLD;BLUE>-<RESET>             <BOLD;BLUE>    These two lines have had their<RESET>
2328         <BOLD;BLUE>-<RESET><BOLD;BLUE>    indentation reduced by four spaces<RESET>
2329         <BOLD;MAGENTA>-<RESET>  <BOLD;MAGENTA>different indentation change<RESET>
2330         <RED>-<RESET><RED>    too short<RESET>
2331         <BOLD;CYAN>+<RESET>     <BOLD;CYAN>Indented text to<RESET>
2332         <BOLD;CYAN>+<RESET>             <BOLD;CYAN>be further indented by four spaces across<RESET>
2333         <BOLD;CYAN>+<RESET>     <BOLD;CYAN>    several lines<RESET>
2334         <BOLD;YELLOW>+<RESET>
2335         <BOLD;YELLOW>+<RESET>           <BOLD;YELLOW>too short without<RESET>
2336         <BOLD;YELLOW>+<RESET>
2337         <BOLD;YELLOW>+<RESET><BOLD;YELLOW>^            being grouped across blank line<RESET>
2338         <BOLD;YELLOW>+<RESET>
2339         <BOLD;CYAN>+<RESET>     <BRED> <RESET>  <BOLD;CYAN>These two lines have had their<RESET>
2340         <BOLD;CYAN>+<RESET><BOLD;CYAN>indentation reduced by four spaces<RESET>
2341         <BOLD;YELLOW>+<RESET>           <BOLD;YELLOW>different indentation change<RESET>
2342         <GREEN>+<RESET><BRED>  <RESET>  <GREEN>too short<RESET>
2343         EOF
2344
2345         test_cmp expected actual
2346 '
2347
2348 test_expect_success 'combine --ignore-blank-lines with --function-context' '
2349         test_write_lines 1 "" 2 3 4 5 >a &&
2350         test_write_lines 1    2 3 4   >b &&
2351         test_must_fail git diff --no-index \
2352                 --ignore-blank-lines --function-context a b >actual.raw &&
2353         sed -n "/@@/,\$p" <actual.raw >actual &&
2354         cat <<-\EOF >expect &&
2355         @@ -1,6 +1,4 @@
2356          1
2357         -
2358          2
2359          3
2360          4
2361         -5
2362         EOF
2363         test_cmp expect actual
2364 '
2365
2366 test_expect_success 'combine --ignore-blank-lines with --function-context 2' '
2367         test_write_lines    a b c "" function 1 2 3 4 5 "" 6 7 8 9 >a &&
2368         test_write_lines "" a b c "" function 1 2 3 4 5    6 7 8   >b &&
2369         test_must_fail git diff --no-index \
2370                 --ignore-blank-lines --function-context a b >actual.raw &&
2371         sed -n "/@@/,\$p" <actual.raw >actual &&
2372         cat <<-\EOF >expect &&
2373         @@ -5,11 +6,9 @@ c
2374          function
2375          1
2376          2
2377          3
2378          4
2379          5
2380         -
2381          6
2382          7
2383          8
2384         -9
2385         EOF
2386         test_cmp expect actual
2387 '
2388
2389 test_done