t/t3206-range-diff.sh

   1 #!/bin/sh
   2
   3 test_description='range-diff tests'
   4
   5 . ./test-lib.sh
   6
   7 # Note that because of the range-diff's heuristics, test_commit does more
   8 # harm than good.  We need some real history.
   9
  10 test_expect_success 'setup' '
  11         git fast-import <"$TEST_DIRECTORY"/t3206/history.export &&
  12         test_oid_cache <<-\EOF
  13         # topic
  14         t1 sha1:4de457d
  15         t2 sha1:fccce22
  16         t3 sha1:147e64e
  17         t4 sha1:a63e992
  18         t1 sha256:b89f8b9
  19         t2 sha256:5f12aad
  20         t3 sha256:ea8b273
  21         t4 sha256:14b7336
  22
  23         # unmodified
  24         u1 sha1:35b9b25
  25         u2 sha1:de345ab
  26         u3 sha1:9af6654
  27         u4 sha1:2901f77
  28         u1 sha256:e3731be
  29         u2 sha256:14fadf8
  30         u3 sha256:736c4bc
  31         u4 sha256:673e77d
  32
  33         # reordered
  34         r1 sha1:aca177a
  35         r2 sha1:14ad629
  36         r3 sha1:ee58208
  37         r4 sha1:307b27a
  38         r1 sha256:f59d3aa
  39         r2 sha256:fb261a8
  40         r3 sha256:cb2649b
  41         r4 sha256:958577e
  42
  43         # removed (deleted)
  44         d1 sha1:7657159
  45         d2 sha1:43d84d3
  46         d3 sha1:a740396
  47         d1 sha256:e312513
  48         d2 sha256:eb19258
  49         d3 sha256:1ccb3c1
  50
  51         # added
  52         a1 sha1:2716022
  53         a2 sha1:b62accd
  54         a3 sha1:df46cfa
  55         a4 sha1:3e64548
  56         a5 sha1:12b4063
  57         a1 sha256:d724f4d
  58         a2 sha256:1de7762
  59         a3 sha256:e159431
  60         a4 sha256:b3e483c
  61         a5 sha256:90866a7
  62
  63         # rebased
  64         b1 sha1:cc9c443
  65         b2 sha1:c5d9641
  66         b3 sha1:28cc2b6
  67         b4 sha1:5628ab7
  68         b5 sha1:a31b12e
  69         b1 sha256:a1a8717
  70         b2 sha256:20a5862
  71         b3 sha256:587172a
  72         b4 sha256:2721c5d
  73         b5 sha256:7b57864
  74
  75         # changed
  76         c1 sha1:a4b3333
  77         c2 sha1:f51d370
  78         c3 sha1:0559556
  79         c4 sha1:d966c5c
  80         c1 sha256:f8c2b9d
  81         c2 sha256:3fb6318
  82         c3 sha256:168ab68
  83         c4 sha256:3526539
  84
  85         # changed-message
  86         m1 sha1:f686024
  87         m2 sha1:4ab067d
  88         m3 sha1:b9cb956
  89         m4 sha1:8add5f1
  90         m1 sha256:31e6281
  91         m2 sha256:a06bf1b
  92         m3 sha256:82dc654
  93         m4 sha256:48470c5
  94
  95         # renamed
  96         n1 sha1:f258d75
  97         n2 sha1:017b62d
  98         n3 sha1:3ce7af6
  99         n4 sha1:1e6226b
 100         n1 sha256:ad52114
 101         n2 sha256:3b54c8f
 102         n3 sha256:3b0a644
 103         n4 sha256:e461653
 104
 105         # mode change
 106         o1 sha1:4d39cb3
 107         o2 sha1:26c107f
 108         o3 sha1:4c1e0f5
 109         o1 sha256:d0dd598
 110         o2 sha256:c4a279e
 111         o3 sha256:78459d7
 112
 113         # added and removed
 114         s1 sha1:096b1ba
 115         s2 sha1:d92e698
 116         s3 sha1:9a1db4d
 117         s4 sha1:fea3b5c
 118         s1 sha256:a7f9134
 119         s2 sha256:b4c2580
 120         s3 sha256:1d62aa2
 121         s4 sha256:48160e8
 122
 123         # Empty delimiter (included so lines match neatly)
 124         __ sha1:-------
 125         __ sha256:-------
 126         EOF
 127 '
 128
 129 test_expect_success 'simple A..B A..C (unmodified)' '
 130         git range-diff --no-color master..topic master..unmodified \
 131                 >actual &&
 132         cat >expect <<-EOF &&
 133         1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
 134         2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
 135         3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
 136         4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
 137         EOF
 138         test_cmp expect actual
 139 '
 140
 141 test_expect_success 'simple B...C (unmodified)' '
 142         git range-diff --no-color topic...unmodified >actual &&
 143         # same "expect" as above
 144         test_cmp expect actual
 145 '
 146
 147 test_expect_success 'simple A B C (unmodified)' '
 148         git range-diff --no-color master topic unmodified >actual &&
 149         # same "expect" as above
 150         test_cmp expect actual
 151 '
 152
 153 test_expect_success 'trivial reordering' '
 154         git range-diff --no-color master topic reordered >actual &&
 155         cat >expect <<-EOF &&
 156         1:  $(test_oid t1) = 1:  $(test_oid r1) s/5/A/
 157         3:  $(test_oid t3) = 2:  $(test_oid r2) s/11/B/
 158         4:  $(test_oid t4) = 3:  $(test_oid r3) s/12/B/
 159         2:  $(test_oid t2) = 4:  $(test_oid r4) s/4/A/
 160         EOF
 161         test_cmp expect actual
 162 '
 163
 164 test_expect_success 'removed a commit' '
 165         git range-diff --no-color master topic removed >actual &&
 166         cat >expect <<-EOF &&
 167         1:  $(test_oid t1) = 1:  $(test_oid d1) s/5/A/
 168         2:  $(test_oid t2) < -:  $(test_oid __) s/4/A/
 169         3:  $(test_oid t3) = 2:  $(test_oid d2) s/11/B/
 170         4:  $(test_oid t4) = 3:  $(test_oid d3) s/12/B/
 171         EOF
 172         test_cmp expect actual
 173 '
 174
 175 test_expect_success 'added a commit' '
 176         git range-diff --no-color master topic added >actual &&
 177         cat >expect <<-EOF &&
 178         1:  $(test_oid t1) = 1:  $(test_oid a1) s/5/A/
 179         2:  $(test_oid t2) = 2:  $(test_oid a2) s/4/A/
 180         -:  $(test_oid __) > 3:  $(test_oid a3) s/6/A/
 181         3:  $(test_oid t3) = 4:  $(test_oid a4) s/11/B/
 182         4:  $(test_oid t4) = 5:  $(test_oid a5) s/12/B/
 183         EOF
 184         test_cmp expect actual
 185 '
 186
 187 test_expect_success 'new base, A B C' '
 188         git range-diff --no-color master topic rebased >actual &&
 189         cat >expect <<-EOF &&
 190         1:  $(test_oid t1) = 1:  $(test_oid b1) s/5/A/
 191         2:  $(test_oid t2) = 2:  $(test_oid b2) s/4/A/
 192         3:  $(test_oid t3) = 3:  $(test_oid b3) s/11/B/
 193         4:  $(test_oid t4) = 4:  $(test_oid b4) s/12/B/
 194         EOF
 195         test_cmp expect actual
 196 '
 197
 198 test_expect_success 'new base, B...C' '
 199         # this syntax includes the commits from master!
 200         git range-diff --no-color topic...rebased >actual &&
 201         cat >expect <<-EOF &&
 202         -:  $(test_oid __) > 1:  $(test_oid b5) unrelated
 203         1:  $(test_oid t1) = 2:  $(test_oid b1) s/5/A/
 204         2:  $(test_oid t2) = 3:  $(test_oid b2) s/4/A/
 205         3:  $(test_oid t3) = 4:  $(test_oid b3) s/11/B/
 206         4:  $(test_oid t4) = 5:  $(test_oid b4) s/12/B/
 207         EOF
 208         test_cmp expect actual
 209 '
 210
 211 test_expect_success 'changed commit' '
 212         git range-diff --no-color topic...changed >actual &&
 213         cat >expect <<-EOF &&
 214         1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 215         2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 216         3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 217             @@ file: A
 218               9
 219               10
 220              -11
 221             -+B
 222             ++BB
 223               12
 224               13
 225               14
 226         4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 227             @@ file
 228              @@ file: A
 229               9
 230               10
 231             - B
 232             + BB
 233              -12
 234              +B
 235               13
 236         EOF
 237         test_cmp expect actual
 238 '
 239
 240 test_expect_success 'changed commit with --no-patch diff option' '
 241         git range-diff --no-color --no-patch topic...changed >actual &&
 242         cat >expect <<-EOF &&
 243         1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 244         2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 245         3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 246         4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 247         EOF
 248         test_cmp expect actual
 249 '
 250
 251 test_expect_success 'changed commit with --stat diff option' '
 252         git range-diff --no-color --stat topic...changed >actual &&
 253         cat >expect <<-EOF &&
 254         1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 255              a => b | 0
 256              1 file changed, 0 insertions(+), 0 deletions(-)
 257         2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 258              a => b | 0
 259              1 file changed, 0 insertions(+), 0 deletions(-)
 260         3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 261              a => b | 0
 262              1 file changed, 0 insertions(+), 0 deletions(-)
 263         4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 264              a => b | 0
 265              1 file changed, 0 insertions(+), 0 deletions(-)
 266         EOF
 267         test_cmp expect actual
 268 '
 269
 270 test_expect_success 'changed commit with sm config' '
 271         git range-diff --no-color --submodule=log topic...changed >actual &&
 272         cat >expect <<-EOF &&
 273         1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 274         2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 275         3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 276             @@ file: A
 277               9
 278               10
 279              -11
 280             -+B
 281             ++BB
 282               12
 283               13
 284               14
 285         4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 286             @@ file
 287              @@ file: A
 288               9
 289               10
 290             - B
 291             + BB
 292              -12
 293              +B
 294               13
 295         EOF
 296         test_cmp expect actual
 297 '
 298
 299 test_expect_success 'renamed file' '
 300         git range-diff --no-color --submodule=log topic...renamed-file >actual &&
 301         sed s/Z/\ /g >expect <<-EOF &&
 302         1:  $(test_oid t1) = 1:  $(test_oid n1) s/5/A/
 303         2:  $(test_oid t2) ! 2:  $(test_oid n2) s/4/A/
 304             @@ Metadata
 305             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 306             Z
 307             Z ## Commit message ##
 308             -    s/4/A/
 309             +    s/4/A/ + rename file
 310             Z
 311             - ## file ##
 312             + ## file => renamed-file ##
 313             Z@@
 314             Z 1
 315             Z 2
 316         3:  $(test_oid t3) ! 3:  $(test_oid n3) s/11/B/
 317             @@ Metadata
 318             Z ## Commit message ##
 319             Z    s/11/B/
 320             Z
 321             - ## file ##
 322             -@@ file: A
 323             + ## renamed-file ##
 324             +@@ renamed-file: A
 325             Z 8
 326             Z 9
 327             Z 10
 328         4:  $(test_oid t4) ! 4:  $(test_oid n4) s/12/B/
 329             @@ Metadata
 330             Z ## Commit message ##
 331             Z    s/12/B/
 332             Z
 333             - ## file ##
 334             -@@ file: A
 335             + ## renamed-file ##
 336             +@@ renamed-file: A
 337             Z 9
 338             Z 10
 339             Z B
 340         EOF
 341         test_cmp expect actual
 342 '
 343
 344 test_expect_success 'file with mode only change' '
 345         git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
 346         sed s/Z/\ /g >expect <<-EOF &&
 347         1:  $(test_oid t2) ! 1:  $(test_oid o1) s/4/A/
 348             @@ Metadata
 349             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 350             Z
 351             Z ## Commit message ##
 352             -    s/4/A/
 353             +    s/4/A/ + add other-file
 354             Z
 355             Z ## file ##
 356             Z@@
 357             @@ file
 358             Z A
 359             Z 6
 360             Z 7
 361             +
 362             + ## other-file (new) ##
 363         2:  $(test_oid t3) ! 2:  $(test_oid o2) s/11/B/
 364             @@ Metadata
 365             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 366             Z
 367             Z ## Commit message ##
 368             -    s/11/B/
 369             +    s/11/B/ + mode change other-file
 370             Z
 371             Z ## file ##
 372             Z@@ file: A
 373             @@ file: A
 374             Z 12
 375             Z 13
 376             Z 14
 377             +
 378             + ## other-file (mode change 100644 => 100755) ##
 379         3:  $(test_oid t4) = 3:  $(test_oid o3) s/12/B/
 380         EOF
 381         test_cmp expect actual
 382 '
 383
 384 test_expect_success 'file added and later removed' '
 385         git range-diff --no-color --submodule=log topic...added-removed >actual &&
 386         sed s/Z/\ /g >expect <<-EOF &&
 387         1:  $(test_oid t1) = 1:  $(test_oid s1) s/5/A/
 388         2:  $(test_oid t2) ! 2:  $(test_oid s2) s/4/A/
 389             @@ Metadata
 390             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 391             Z
 392             Z ## Commit message ##
 393             -    s/4/A/
 394             +    s/4/A/ + new-file
 395             Z
 396             Z ## file ##
 397             Z@@
 398             @@ file
 399             Z A
 400             Z 6
 401             Z 7
 402             +
 403             + ## new-file (new) ##
 404         3:  $(test_oid t3) ! 3:  $(test_oid s3) s/11/B/
 405             @@ Metadata
 406             ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 407             Z
 408             Z ## Commit message ##
 409             -    s/11/B/
 410             +    s/11/B/ + remove file
 411             Z
 412             Z ## file ##
 413             Z@@ file: A
 414             @@ file: A
 415             Z 12
 416             Z 13
 417             Z 14
 418             +
 419             + ## new-file (deleted) ##
 420         4:  $(test_oid t4) = 4:  $(test_oid s4) s/12/B/
 421         EOF
 422         test_cmp expect actual
 423 '
 424
 425 test_expect_success 'no commits on one side' '
 426         git commit --amend -m "new message" &&
 427         git range-diff master HEAD@{1} HEAD
 428 '
 429
 430 test_expect_success 'changed message' '
 431         git range-diff --no-color topic...changed-message >actual &&
 432         sed s/Z/\ /g >expect <<-EOF &&
 433         1:  $(test_oid t1) = 1:  $(test_oid m1) s/5/A/
 434         2:  $(test_oid t2) ! 2:  $(test_oid m2) s/4/A/
 435             @@ Metadata
 436             Z ## Commit message ##
 437             Z    s/4/A/
 438             Z
 439             +    Also a silly comment here!
 440             +
 441             Z ## file ##
 442             Z@@
 443             Z 1
 444         3:  $(test_oid t3) = 3:  $(test_oid m3) s/11/B/
 445         4:  $(test_oid t4) = 4:  $(test_oid m4) s/12/B/
 446         EOF
 447         test_cmp expect actual
 448 '
 449
 450 test_expect_success 'dual-coloring' '
 451         sed -e "s|^:||" >expect <<-EOF &&
 452         :<YELLOW>1:  $(test_oid c1) = 1:  $(test_oid m1) s/5/A/<RESET>
 453         :<RED>2:  $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2:  $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
 454         :    <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
 455         :      ## Commit message ##<RESET>
 456         :         s/4/A/<RESET>
 457         :     <RESET>
 458         :    <REVERSE><GREEN>+<RESET><BOLD>    Also a silly comment here!<RESET>
 459         :    <REVERSE><GREEN>+<RESET>
 460         :      ## file ##<RESET>
 461         :    <CYAN> @@<RESET>
 462         :      1<RESET>
 463         :<RED>3:  $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3:  $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
 464         :    <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
 465         :      9<RESET>
 466         :      10<RESET>
 467         :    <RED> -11<RESET>
 468         :    <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
 469         :    <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
 470         :      12<RESET>
 471         :      13<RESET>
 472         :      14<RESET>
 473         :<RED>4:  $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4:  $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
 474         :    <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
 475         :    <CYAN> @@ file: A<RESET>
 476         :      9<RESET>
 477         :      10<RESET>
 478         :    <REVERSE><RED>-<RESET><FAINT> BB<RESET>
 479         :    <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
 480         :    <RED> -12<RESET>
 481         :    <GREEN> +B<RESET>
 482         :      13<RESET>
 483         EOF
 484         git range-diff changed...changed-message --color --dual-color >actual.raw &&
 485         test_decode_color >actual <actual.raw &&
 486         test_cmp expect actual
 487 '
 488
 489 for prev in topic master..topic
 490 do
 491         test_expect_success "format-patch --range-diff=$prev" '
 492                 git format-patch --cover-letter --range-diff=$prev \
 493                         master..unmodified >actual &&
 494                 test_when_finished "rm 000?-*" &&
 495                 test_line_count = 5 actual &&
 496                 test_i18ngrep "^Range-diff:$" 0000-* &&
 497                 grep "= 1: .* s/5/A" 0000-* &&
 498                 grep "= 2: .* s/4/A" 0000-* &&
 499                 grep "= 3: .* s/11/B" 0000-* &&
 500                 grep "= 4: .* s/12/B" 0000-*
 501         '
 502 done
 503
 504 test_expect_success 'format-patch --range-diff as commentary' '
 505         git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
 506         test_when_finished "rm 0001-*" &&
 507         test_line_count = 1 actual &&
 508         test_i18ngrep "^Range-diff:$" 0001-* &&
 509         grep "> 1: .* new message" 0001-*
 510 '
 511
 512 test_expect_success 'range-diff overrides diff.noprefix internally' '
 513         git -c diff.noprefix=true range-diff HEAD^...
 514 '
 515
 516 test_expect_success 'range-diff compares notes by default' '
 517         git notes add -m "topic note" topic &&
 518         git notes add -m "unmodified note" unmodified &&
 519         test_when_finished git notes remove topic unmodified &&
 520         git range-diff --no-color master..topic master..unmodified \
 521                 >actual &&
 522         sed s/Z/\ /g >expect <<-EOF &&
 523         1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
 524         2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
 525         3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
 526         4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
 527             @@ Commit message
 528             Z
 529             Z
 530             Z ## Notes ##
 531             -    topic note
 532             +    unmodified note
 533             Z
 534             Z ## file ##
 535             Z@@ file: A
 536         EOF
 537         test_cmp expect actual
 538 '
 539
 540 test_expect_success 'range-diff with --no-notes' '
 541         git notes add -m "topic note" topic &&
 542         git notes add -m "unmodified note" unmodified &&
 543         test_when_finished git notes remove topic unmodified &&
 544         git range-diff --no-color --no-notes master..topic master..unmodified \
 545                 >actual &&
 546         cat >expect <<-EOF &&
 547         1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
 548         2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
 549         3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
 550         4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
 551         EOF
 552         test_cmp expect actual
 553 '
 554
 555 test_expect_success 'range-diff with multiple --notes' '
 556         git notes --ref=note1 add -m "topic note1" topic &&
 557         git notes --ref=note1 add -m "unmodified note1" unmodified &&
 558         test_when_finished git notes --ref=note1 remove topic unmodified &&
 559         git notes --ref=note2 add -m "topic note2" topic &&
 560         git notes --ref=note2 add -m "unmodified note2" unmodified &&
 561         test_when_finished git notes --ref=note2 remove topic unmodified &&
 562         git range-diff --no-color --notes=note1 --notes=note2 master..topic master..unmodified \
 563                 >actual &&
 564         sed s/Z/\ /g >expect <<-EOF &&
 565         1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
 566         2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
 567         3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
 568         4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
 569             @@ Commit message
 570             Z
 571             Z
 572             Z ## Notes (note1) ##
 573             -    topic note1
 574             +    unmodified note1
 575             Z
 576             Z
 577             Z ## Notes (note2) ##
 578             -    topic note2
 579             +    unmodified note2
 580             Z
 581             Z ## file ##
 582             Z@@ file: A
 583         EOF
 584         test_cmp expect actual
 585 '
 586
 587 test_expect_success 'format-patch --range-diff does not compare notes by default' '
 588         git notes add -m "topic note" topic &&
 589         git notes add -m "unmodified note" unmodified &&
 590         test_when_finished git notes remove topic unmodified &&
 591         git format-patch --cover-letter --range-diff=$prev \
 592                 master..unmodified >actual &&
 593         test_when_finished "rm 000?-*" &&
 594         test_line_count = 5 actual &&
 595         test_i18ngrep "^Range-diff:$" 0000-* &&
 596         grep "= 1: .* s/5/A" 0000-* &&
 597         grep "= 2: .* s/4/A" 0000-* &&
 598         grep "= 3: .* s/11/B" 0000-* &&
 599         grep "= 4: .* s/12/B" 0000-* &&
 600         ! grep "Notes" 0000-* &&
 601         ! grep "note" 0000-*
 602 '
 603
 604 test_expect_success 'format-patch --range-diff with --no-notes' '
 605         git notes add -m "topic note" topic &&
 606         git notes add -m "unmodified note" unmodified &&
 607         test_when_finished git notes remove topic unmodified &&
 608         git format-patch --no-notes --cover-letter --range-diff=$prev \
 609                 master..unmodified >actual &&
 610         test_when_finished "rm 000?-*" &&
 611         test_line_count = 5 actual &&
 612         test_i18ngrep "^Range-diff:$" 0000-* &&
 613         grep "= 1: .* s/5/A" 0000-* &&
 614         grep "= 2: .* s/4/A" 0000-* &&
 615         grep "= 3: .* s/11/B" 0000-* &&
 616         grep "= 4: .* s/12/B" 0000-* &&
 617         ! grep "Notes" 0000-* &&
 618         ! grep "note" 0000-*
 619 '
 620
 621 test_expect_success 'format-patch --range-diff with --notes' '
 622         git notes add -m "topic note" topic &&
 623         git notes add -m "unmodified note" unmodified &&
 624         test_when_finished git notes remove topic unmodified &&
 625         git format-patch --notes --cover-letter --range-diff=$prev \
 626                 master..unmodified >actual &&
 627         test_when_finished "rm 000?-*" &&
 628         test_line_count = 5 actual &&
 629         test_i18ngrep "^Range-diff:$" 0000-* &&
 630         grep "= 1: .* s/5/A" 0000-* &&
 631         grep "= 2: .* s/4/A" 0000-* &&
 632         grep "= 3: .* s/11/B" 0000-* &&
 633         grep "! 4: .* s/12/B" 0000-* &&
 634         sed s/Z/\ /g >expect <<-EOF &&
 635             @@ Commit message
 636             Z
 637             Z
 638             Z ## Notes ##
 639             -    topic note
 640             +    unmodified note
 641             Z
 642             Z ## file ##
 643             Z@@ file: A
 644         EOF
 645         sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
 646         test_cmp expect actual
 647 '
 648
 649 test_expect_success 'format-patch --range-diff with format.notes config' '
 650         git notes add -m "topic note" topic &&
 651         git notes add -m "unmodified note" unmodified &&
 652         test_when_finished git notes remove topic unmodified &&
 653         test_config format.notes true &&
 654         git format-patch --cover-letter --range-diff=$prev \
 655                 master..unmodified >actual &&
 656         test_when_finished "rm 000?-*" &&
 657         test_line_count = 5 actual &&
 658         test_i18ngrep "^Range-diff:$" 0000-* &&
 659         grep "= 1: .* s/5/A" 0000-* &&
 660         grep "= 2: .* s/4/A" 0000-* &&
 661         grep "= 3: .* s/11/B" 0000-* &&
 662         grep "! 4: .* s/12/B" 0000-* &&
 663         sed s/Z/\ /g >expect <<-EOF &&
 664             @@ Commit message
 665             Z
 666             Z
 667             Z ## Notes ##
 668             -    topic note
 669             +    unmodified note
 670             Z
 671             Z ## file ##
 672             Z@@ file: A
 673         EOF
 674         sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
 675         test_cmp expect actual
 676 '
 677
 678 test_expect_success 'format-patch --range-diff with multiple notes' '
 679         git notes --ref=note1 add -m "topic note1" topic &&
 680         git notes --ref=note1 add -m "unmodified note1" unmodified &&
 681         test_when_finished git notes --ref=note1 remove topic unmodified &&
 682         git notes --ref=note2 add -m "topic note2" topic &&
 683         git notes --ref=note2 add -m "unmodified note2" unmodified &&
 684         test_when_finished git notes --ref=note2 remove topic unmodified &&
 685         git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \
 686                 master..unmodified >actual &&
 687         test_when_finished "rm 000?-*" &&
 688         test_line_count = 5 actual &&
 689         test_i18ngrep "^Range-diff:$" 0000-* &&
 690         grep "= 1: .* s/5/A" 0000-* &&
 691         grep "= 2: .* s/4/A" 0000-* &&
 692         grep "= 3: .* s/11/B" 0000-* &&
 693         grep "! 4: .* s/12/B" 0000-* &&
 694         sed s/Z/\ /g >expect <<-EOF &&
 695             @@ Commit message
 696             Z
 697             Z
 698             Z ## Notes (note1) ##
 699             -    topic note1
 700             +    unmodified note1
 701             Z
 702             Z
 703             Z ## Notes (note2) ##
 704             -    topic note2
 705             +    unmodified note2
 706             Z
 707             Z ## file ##
 708             Z@@ file: A
 709         EOF
 710         sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
 711         test_cmp expect actual
 712 '
 713
 714 test_done