t/t4013-diff-various.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Junio C Hamano
   4 #
   5
   6 test_description='Various diff formatting options'
   7
   8 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
   9 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
  10
  11 TEST_PASSES_SANITIZE_LEAK=true
  12 . ./test-lib.sh
  13 . "$TEST_DIRECTORY"/lib-diff.sh
  14
  15 test_expect_success setup '
  16
  17         GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
  18         GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
  19         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  20
  21         mkdir dir &&
  22         mkdir dir2 &&
  23         test_write_lines 1 2 3 >file0 &&
  24         test_write_lines A B >dir/sub &&
  25         cat file0 >file2 &&
  26         git add file0 file2 dir/sub &&
  27         git commit -m Initial &&
  28
  29         git branch initial &&
  30         git branch side &&
  31
  32         GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
  33         GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
  34         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  35
  36         test_write_lines 4 5 6 >>file0 &&
  37         test_write_lines C D >>dir/sub &&
  38         rm -f file2 &&
  39         git update-index --remove file0 file2 dir/sub &&
  40         git commit -m "Second${LF}${LF}This is the second commit." &&
  41
  42         GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
  43         GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
  44         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  45
  46         test_write_lines A B C >file1 &&
  47         git add file1 &&
  48         test_write_lines E F >>dir/sub &&
  49         git update-index dir/sub &&
  50         git commit -m Third &&
  51
  52         GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
  53         GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
  54         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  55
  56         git checkout side &&
  57         test_write_lines A B C >>file0 &&
  58         test_write_lines 1 2 >>dir/sub &&
  59         cat dir/sub >file3 &&
  60         git add file3 &&
  61         git update-index file0 dir/sub &&
  62         git commit -m Side &&
  63
  64         GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
  65         GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
  66         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  67
  68         git checkout master &&
  69         git pull -s ours --no-rebase . side &&
  70
  71         GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
  72         GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
  73         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  74
  75         test_write_lines A B C >>file0 &&
  76         test_write_lines 1 2 >>dir/sub &&
  77         git update-index file0 dir/sub &&
  78
  79         mkdir dir3 &&
  80         cp dir/sub dir3/sub &&
  81         test-tool chmtime +1 dir3/sub &&
  82
  83         git config log.showroot false &&
  84         git commit --amend &&
  85
  86         GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
  87         GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
  88         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  89         git checkout -b rearrange initial &&
  90         test_write_lines B A >dir/sub &&
  91         git add dir/sub &&
  92         git commit -m "Rearranged lines in dir/sub" &&
  93         git checkout master &&
  94
  95         GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
  96         GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
  97         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
  98         git checkout -b mode initial &&
  99         git update-index --chmod=+x file0 &&
 100         git commit -m "update mode" &&
 101         git checkout -f master &&
 102
 103         GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
 104         GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
 105         export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 106         git checkout -b note initial &&
 107         git update-index --chmod=+x file2 &&
 108         git commit -m "update mode (file2)" &&
 109         git notes add -m "note" &&
 110         git checkout -f master &&
 111
 112         # Same merge as master, but with parents reversed. Hide it in a
 113         # pseudo-ref to avoid impacting tests with --all.
 114         commit=$(echo reverse |
 115                  git commit-tree -p master^2 -p master^1 master^{tree}) &&
 116         git update-ref REVERSE $commit &&
 117
 118         git config diff.renames false &&
 119
 120         git show-branch
 121 '
 122
 123 : <<\EOF
 124 ! [initial] Initial
 125  * [master] Merge branch 'side'
 126   ! [rearrange] Rearranged lines in dir/sub
 127    ! [side] Side
 128 ----
 129   +  [rearrange] Rearranged lines in dir/sub
 130  -   [master] Merge branch 'side'
 131  * + [side] Side
 132  *   [master^] Third
 133  *   [master~2] Second
 134 +*++ [initial] Initial
 135 EOF
 136
 137 process_diffs () {
 138         perl -e '
 139                 my $oid_length = length($ARGV[0]);
 140                 my $x40 = "[0-9a-f]{40}";
 141                 my $xab = "[0-9a-f]{4,16}";
 142                 my $orx = "[0-9a-f]" x $oid_length;
 143
 144                 sub munge_oid {
 145                         my ($oid) = @_;
 146                         my $x;
 147
 148                         return "" unless length $oid;
 149
 150                         if ($oid =~ /^(100644|100755|120000)$/) {
 151                                 return $oid;
 152                         }
 153
 154                         if ($oid =~ /^0*$/) {
 155                                 $x = "0";
 156                         } else {
 157                                 $x = "f";
 158                         }
 159
 160                         if (length($oid) == 40) {
 161                                 return $x x $oid_length;
 162                         } else {
 163                                 return $x x length($oid);
 164                         }
 165                 }
 166
 167                 while (<STDIN>) {
 168                         s/($orx)/munge_oid($1)/ge;
 169                         s/From ($x40)( |\))/"From " . munge_oid($1) . $2/ge;
 170                         s/commit ($x40)($| \(from )($x40?)/"commit " .  munge_oid($1) . $2 . munge_oid($3)/ge;
 171                         s/\b($x40)( |\.\.|$)/munge_oid($1) . $2/ge;
 172                         s/^($x40)($| )/munge_oid($1) . $2/e;
 173                         s/($xab)(\.\.|,| |\.\.\.|$)/munge_oid($1) . $2/ge;
 174                         print;
 175                 }
 176         ' "$ZERO_OID" <"$1"
 177 }
 178
 179 V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
 180 while read magic cmd
 181 do
 182         case "$magic" in
 183         '' | '#'*)
 184                 continue ;;
 185         :noellipses)
 186                 magic=noellipses
 187                 label="$magic-$cmd"
 188                 ;;
 189         :*)
 190                 BUG "unknown magic $magic"
 191                 ;;
 192         *)
 193                 cmd="$magic $cmd"
 194                 magic=
 195                 label="$cmd"
 196                 ;;
 197         esac
 198
 199         test=$(echo "$label" | sed -e 's|[/ ][/ ]*|_|g')
 200         pfx=$(printf "%04d" $test_count)
 201         expect="$TEST_DIRECTORY/t4013/diff.$test"
 202         actual="$pfx-diff.$test"
 203
 204         test_expect_success "git $cmd # magic is ${magic:-(not used)}" '
 205                 {
 206                         echo "$ git $cmd"
 207                         case "$magic" in
 208                         "")
 209                                 GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
 210                         noellipses)
 211                                 git $cmd ;;
 212                         esac |
 213                         sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
 214                             -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
 215                         echo "\$"
 216                 } >"$actual" &&
 217                 if test -f "$expect"
 218                 then
 219                         process_diffs "$actual" >actual &&
 220                         process_diffs "$expect" >expect &&
 221                         case $cmd in
 222                         *format-patch* | *-stat*)
 223                                 test_cmp expect actual;;
 224                         *)
 225                                 test_cmp expect actual;;
 226                         esac &&
 227                         rm -f "$actual" actual expect
 228                 else
 229                         # this is to help developing new tests.
 230                         cp "$actual" "$expect"
 231                         false
 232                 fi
 233         '
 234 done <<\EOF
 235 diff-tree initial
 236 diff-tree -r initial
 237 diff-tree -r --abbrev initial
 238 diff-tree -r --abbrev=4 initial
 239 diff-tree --root initial
 240 diff-tree --root --abbrev initial
 241 :noellipses diff-tree --root --abbrev initial
 242 diff-tree --root -r initial
 243 diff-tree --root -r --abbrev initial
 244 :noellipses diff-tree --root -r --abbrev initial
 245 diff-tree --root -r --abbrev=4 initial
 246 :noellipses diff-tree --root -r --abbrev=4 initial
 247 diff-tree -p initial
 248 diff-tree --root -p initial
 249 diff-tree --root -p --abbrev=10 initial
 250 diff-tree --root -p --full-index initial
 251 diff-tree --root -p --full-index --abbrev=10 initial
 252 diff-tree --patch-with-stat initial
 253 diff-tree --root --patch-with-stat initial
 254 diff-tree --patch-with-raw initial
 255 diff-tree --root --patch-with-raw initial
 256
 257 diff-tree --pretty initial
 258 diff-tree --pretty --root initial
 259 diff-tree --pretty -p initial
 260 diff-tree --pretty --stat initial
 261 diff-tree --pretty --summary initial
 262 diff-tree --pretty --stat --summary initial
 263 diff-tree --pretty --root -p initial
 264 diff-tree --pretty --root --stat initial
 265 # improved by Timo's patch
 266 diff-tree --pretty --root --summary initial
 267 # improved by Timo's patch
 268 diff-tree --pretty --root --summary -r initial
 269 diff-tree --pretty --root --stat --summary initial
 270 diff-tree --pretty --patch-with-stat initial
 271 diff-tree --pretty --root --patch-with-stat initial
 272 diff-tree --pretty --patch-with-raw initial
 273 diff-tree --pretty --root --patch-with-raw initial
 274
 275 diff-tree --pretty=oneline initial
 276 diff-tree --pretty=oneline --root initial
 277 diff-tree --pretty=oneline -p initial
 278 diff-tree --pretty=oneline --root -p initial
 279 diff-tree --pretty=oneline --patch-with-stat initial
 280 # improved by Timo's patch
 281 diff-tree --pretty=oneline --root --patch-with-stat initial
 282 diff-tree --pretty=oneline --patch-with-raw initial
 283 diff-tree --pretty=oneline --root --patch-with-raw initial
 284
 285 diff-tree --pretty side
 286 diff-tree --pretty -p side
 287 diff-tree --pretty --patch-with-stat side
 288
 289 diff-tree initial mode
 290 diff-tree --stat initial mode
 291 diff-tree --summary initial mode
 292
 293 diff-tree master
 294 diff-tree -m master
 295 diff-tree -p master
 296 diff-tree -p -m master
 297 diff-tree -c master
 298 diff-tree -c --abbrev master
 299 :noellipses diff-tree -c --abbrev master
 300 diff-tree --cc master
 301 # stat only should show the diffstat with the first parent
 302 diff-tree -c --stat master
 303 diff-tree --cc --stat master
 304 diff-tree -c --stat --summary master
 305 diff-tree --cc --stat --summary master
 306 # stat summary should show the diffstat and summary with the first parent
 307 diff-tree -c --stat --summary side
 308 diff-tree --cc --stat --summary side
 309 diff-tree --cc --shortstat master
 310 diff-tree --cc --summary REVERSE
 311 # improved by Timo's patch
 312 diff-tree --cc --patch-with-stat master
 313 # improved by Timo's patch
 314 diff-tree --cc --patch-with-stat --summary master
 315 # this is correct
 316 diff-tree --cc --patch-with-stat --summary side
 317
 318 log master
 319 log -p master
 320 log --root master
 321 log --root -p master
 322 log --patch-with-stat master
 323 log --root --patch-with-stat master
 324 log --root --patch-with-stat --summary master
 325 # improved by Timo's patch
 326 log --root -c --patch-with-stat --summary master
 327 # improved by Timo's patch
 328 log --root --cc --patch-with-stat --summary master
 329 log --no-diff-merges -p --first-parent master
 330 log --diff-merges=off -p --first-parent master
 331 log --first-parent --diff-merges=off -p master
 332 log -p --first-parent master
 333 log -p --diff-merges=first-parent master
 334 log --diff-merges=first-parent master
 335 log -m -p --first-parent master
 336 log -m -p master
 337 log --cc -m -p master
 338 log -c -m -p master
 339 log -m --raw master
 340 log -m --stat master
 341 log -SF master
 342 log -S F master
 343 log -SF -p master
 344 log -SF master --max-count=0
 345 log -SF master --max-count=1
 346 log -SF master --max-count=2
 347 log -GF master
 348 log -GF -p master
 349 log -GF -p --pickaxe-all master
 350 log -IA -IB -I1 -I2 -p master
 351 log --decorate --all
 352 log --decorate=full --all
 353 log --decorate --clear-decorations --all
 354 log --decorate=full --clear-decorations --all
 355
 356 rev-list --parents HEAD
 357 rev-list --children HEAD
 358
 359 whatchanged master
 360 :noellipses whatchanged master
 361 whatchanged -p master
 362 whatchanged --root master
 363 :noellipses whatchanged --root master
 364 whatchanged --root -p master
 365 whatchanged --patch-with-stat master
 366 whatchanged --root --patch-with-stat master
 367 whatchanged --root --patch-with-stat --summary master
 368 # improved by Timo's patch
 369 whatchanged --root -c --patch-with-stat --summary master
 370 # improved by Timo's patch
 371 whatchanged --root --cc --patch-with-stat --summary master
 372 whatchanged -SF master
 373 :noellipses whatchanged -SF master
 374 whatchanged -SF -p master
 375
 376 log --patch-with-stat master -- dir/
 377 whatchanged --patch-with-stat master -- dir/
 378 log --patch-with-stat --summary master -- dir/
 379 whatchanged --patch-with-stat --summary master -- dir/
 380
 381 show initial
 382 show --root initial
 383 show side
 384 show master
 385 show -c master
 386 show -m master
 387 show --first-parent master
 388 show --stat side
 389 show --stat --summary side
 390 show --patch-with-stat side
 391 show --patch-with-raw side
 392 :noellipses show --patch-with-raw side
 393 show --patch-with-stat --summary side
 394
 395 format-patch --stdout initial..side
 396 format-patch --stdout initial..master^
 397 format-patch --stdout initial..master
 398 format-patch --stdout --no-numbered initial..master
 399 format-patch --stdout --numbered initial..master
 400 format-patch --attach --stdout initial..side
 401 format-patch --attach --stdout --suffix=.diff initial..side
 402 format-patch --attach --stdout initial..master^
 403 format-patch --attach --stdout initial..master
 404 format-patch --inline --stdout initial..side
 405 format-patch --inline --stdout initial..master^
 406 format-patch --inline --stdout --numbered-files initial..master
 407 format-patch --inline --stdout initial..master
 408 format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
 409 config format.subjectprefix DIFFERENT_PREFIX
 410 format-patch --inline --stdout initial..master^^
 411 format-patch --stdout --cover-letter -n initial..master^
 412
 413 diff --abbrev initial..side
 414 diff -U initial..side
 415 diff -U1 initial..side
 416 diff -r initial..side
 417 diff --stat initial..side
 418 diff -r --stat initial..side
 419 diff initial..side
 420 diff --patch-with-stat initial..side
 421 diff --patch-with-raw initial..side
 422 :noellipses diff --patch-with-raw initial..side
 423 diff --patch-with-stat -r initial..side
 424 diff --patch-with-raw -r initial..side
 425 :noellipses diff --patch-with-raw -r initial..side
 426 diff --name-status dir2 dir
 427 diff --no-index --name-status dir2 dir
 428 diff --no-index --name-status -- dir2 dir
 429 diff --no-index dir dir3
 430 diff master master^ side
 431 # Can't use spaces...
 432 diff --line-prefix=abc master master^ side
 433 diff --dirstat master~1 master~2
 434 diff --dirstat initial rearrange
 435 diff --dirstat-by-file initial rearrange
 436 diff --dirstat --cc master~1 master
 437 # No-index --abbrev and --no-abbrev
 438 diff --raw initial
 439 :noellipses diff --raw initial
 440 diff --raw --abbrev=4 initial
 441 :noellipses diff --raw --abbrev=4 initial
 442 diff --raw --no-abbrev initial
 443 diff --no-index --raw dir2 dir
 444 :noellipses diff --no-index --raw dir2 dir
 445 diff --no-index --raw --abbrev=4 dir2 dir
 446 :noellipses diff --no-index --raw --abbrev=4 dir2 dir
 447 diff --no-index --raw --no-abbrev dir2 dir
 448
 449 diff-tree --pretty --root --stat --compact-summary initial
 450 diff-tree --pretty -R --root --stat --compact-summary initial
 451 diff-tree --pretty note
 452 diff-tree --pretty --notes note
 453 diff-tree --format=%N note
 454 diff-tree --stat --compact-summary initial mode
 455 diff-tree -R --stat --compact-summary initial mode
 456 EOF
 457
 458 test_expect_success 'log -m matches pure log' '
 459         git log master >result &&
 460         process_diffs result >expected &&
 461         git log -m >result &&
 462         process_diffs result >actual &&
 463         test_cmp expected actual
 464 '
 465
 466 test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
 467         git log -p --diff-merges=separate master >result &&
 468         process_diffs result >expected &&
 469         git log -p --diff-merges=on master >result &&
 470         process_diffs result >actual &&
 471         test_cmp expected actual
 472 '
 473
 474 test_expect_success 'log --dd matches --diff-merges=1 -p' '
 475         git log --diff-merges=1 -p master >result &&
 476         process_diffs result >expected &&
 477         git log --dd master >result &&
 478         process_diffs result >actual &&
 479         test_cmp expected actual
 480 '
 481
 482 test_expect_success 'deny wrong log.diffMerges config' '
 483         test_config log.diffMerges wrong-value &&
 484         test_expect_code 128 git log
 485 '
 486
 487 test_expect_success 'git config log.diffMerges first-parent' '
 488         git log -p --diff-merges=first-parent master >result &&
 489         process_diffs result >expected &&
 490         test_config log.diffMerges first-parent &&
 491         git log -p --diff-merges=on master >result &&
 492         process_diffs result >actual &&
 493         test_cmp expected actual
 494 '
 495
 496 test_expect_success 'git config log.diffMerges first-parent vs -m' '
 497         git log -p --diff-merges=first-parent master >result &&
 498         process_diffs result >expected &&
 499         test_config log.diffMerges first-parent &&
 500         git log -p -m master >result &&
 501         process_diffs result >actual &&
 502         test_cmp expected actual
 503 '
 504
 505 # -m in "git diff-index" means "match missing", that differs
 506 # from its meaning in "git diff". Let's check it in diff-index.
 507 # The line in the output for removed file should disappear when
 508 # we provide -m in diff-index.
 509 test_expect_success 'git diff-index -m' '
 510         rm -f file1 &&
 511         git diff-index HEAD >without-m &&
 512         lines_count=$(wc -l <without-m) &&
 513         git diff-index -m HEAD >with-m &&
 514         git restore file1 &&
 515         test_line_count = $((lines_count - 1)) with-m
 516 '
 517
 518 test_expect_success 'log -S requires an argument' '
 519         test_must_fail git log -S
 520 '
 521
 522 test_expect_success 'diff --cached on unborn branch' '
 523         git symbolic-ref HEAD refs/heads/unborn &&
 524         git diff --cached >result &&
 525         process_diffs result >actual &&
 526         process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
 527         test_cmp expected actual
 528 '
 529
 530 test_expect_success 'diff --cached -- file on unborn branch' '
 531         git diff --cached -- file0 >result &&
 532         process_diffs result >actual &&
 533         process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
 534         test_cmp expected actual
 535 '
 536 test_expect_success 'diff --line-prefix with spaces' '
 537         git diff --line-prefix="| | | " --cached -- file0 >result &&
 538         process_diffs result >actual &&
 539         process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
 540         test_cmp expected actual
 541 '
 542
 543 test_expect_success 'diff-tree --stdin with log formatting' '
 544         cat >expect <<-\EOF &&
 545         Side
 546         Third
 547         Second
 548         EOF
 549         git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
 550         test_cmp expect actual
 551 '
 552
 553 test_expect_success 'diff-tree --stdin with pathspec' '
 554         cat >expect <<-EOF &&
 555         Third
 556
 557         dir/sub
 558         Second
 559
 560         dir/sub
 561         EOF
 562         git rev-list master^ |
 563         git diff-tree -r --stdin --name-only --format=%s dir >actual &&
 564         test_cmp expect actual
 565 '
 566
 567 test_expect_success 'show A B ... -- <pathspec>' '
 568         # side touches dir/sub, file0, and file3
 569         # master^ touches dir/sub, and file1
 570         # master^^ touches dir/sub, file0, and file2
 571         git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
 572         cat >expect <<-\EOF &&
 573         <Side>
 574
 575         dir/sub
 576         <Third>
 577
 578         dir/sub
 579         <Second>
 580
 581         dir/sub
 582         EOF
 583         test_cmp expect actual
 584 '
 585
 586 test_expect_success 'diff -I<regex>: setup' '
 587         git checkout master &&
 588         test_seq 50 >file0 &&
 589         git commit -m "Set up -I<regex> test file" file0 &&
 590         test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
 591         echo >>file0
 592 '
 593 test_expect_success 'diff -I<regex>' '
 594         git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
 595         cat >expect <<-\EOF &&
 596         diff --git a/file0 b/file0
 597         --- a/file0
 598         +++ b/file0
 599         @@ -34,7 +31,6 @@
 600          34
 601          35
 602          36
 603         -37
 604          38
 605          39
 606          40
 607         EOF
 608         compare_diff_patch expect actual
 609 '
 610
 611 test_expect_success 'diff -I<regex> --stat' '
 612         git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
 613         cat >expect <<-\EOF &&
 614          file0 | 1 -
 615          1 file changed, 1 deletion(-)
 616         EOF
 617         test_cmp expect actual
 618 '
 619
 620 test_expect_success 'diff -I<regex>: detect malformed regex' '
 621         test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
 622         test_grep "invalid regex given to -I: " error
 623 '
 624
 625 # check_prefix <patch> <src> <dst>
 626 # check only lines with paths to avoid dependency on exact oid/contents
 627 check_prefix () {
 628         grep -E '^(diff|---|\+\+\+) ' "$1" >actual.paths &&
 629         cat >expect <<-EOF &&
 630         diff --git $2 $3
 631         --- $2
 632         +++ $3
 633         EOF
 634         test_cmp expect actual.paths
 635 }
 636
 637 test_expect_success 'diff-files does not respect diff.noPrefix' '
 638         git -c diff.noPrefix diff-files -p >actual &&
 639         check_prefix actual a/file0 b/file0
 640 '
 641
 642 test_expect_success 'diff-files respects --no-prefix' '
 643         git diff-files -p --no-prefix >actual &&
 644         check_prefix actual file0 file0
 645 '
 646
 647 test_expect_success 'diff respects diff.noPrefix' '
 648         git -c diff.noPrefix diff >actual &&
 649         check_prefix actual file0 file0
 650 '
 651
 652 test_expect_success 'diff --default-prefix overrides diff.noPrefix' '
 653         git -c diff.noPrefix diff --default-prefix >actual &&
 654         check_prefix actual a/file0 b/file0
 655 '
 656
 657 test_expect_success 'diff respects diff.mnemonicPrefix' '
 658         git -c diff.mnemonicPrefix diff >actual &&
 659         check_prefix actual i/file0 w/file0
 660 '
 661
 662 test_expect_success 'diff --default-prefix overrides diff.mnemonicPrefix' '
 663         git -c diff.mnemonicPrefix diff --default-prefix >actual &&
 664         check_prefix actual a/file0 b/file0
 665 '
 666
 667 test_expect_success 'diff respects diff.srcPrefix' '
 668         git -c diff.srcPrefix=x/ diff >actual &&
 669         check_prefix actual x/file0 b/file0
 670 '
 671
 672 test_expect_success 'diff respects diff.dstPrefix' '
 673         git -c diff.dstPrefix=y/ diff >actual &&
 674         check_prefix actual a/file0 y/file0
 675 '
 676
 677 test_expect_success 'diff --src-prefix overrides diff.srcPrefix' '
 678         git -c diff.srcPrefix=y/ diff --src-prefix=z/ >actual &&
 679         check_prefix actual z/file0 b/file0
 680 '
 681
 682 test_expect_success 'diff --dst-prefix overrides diff.dstPrefix' '
 683         git -c diff.dstPrefix=y/ diff --dst-prefix=z/ >actual &&
 684         check_prefix actual a/file0 z/file0
 685 '
 686
 687 test_expect_success 'diff.{src,dst}Prefix ignored with diff.noPrefix' '
 688         git -c diff.dstPrefix=y/ -c diff.srcPrefix=x/ -c diff.noPrefix diff >actual &&
 689         check_prefix actual file0 file0
 690 '
 691
 692 test_expect_success 'diff.{src,dst}Prefix ignored with diff.mnemonicPrefix' '
 693         git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ -c diff.mnemonicPrefix diff >actual &&
 694         check_prefix actual i/file0 w/file0
 695 '
 696
 697 test_expect_success 'diff.{src,dst}Prefix ignored with --default-prefix' '
 698         git -c diff.dstPrefix=x/ -c diff.srcPrefix=y/ diff --default-prefix >actual &&
 699         check_prefix actual a/file0 b/file0
 700 '
 701
 702 test_expect_success 'diff --no-renames cannot be abbreviated' '
 703         test_expect_code 129 git diff --no-rename >actual 2>error &&
 704         test_must_be_empty actual &&
 705         grep "invalid option: --no-rename" error
 706 '
 707
 708 test_done