t / t4014-format-patch.shon commit test-lib: tests skipped by GIT_SKIP_TESTS say so (ef2ac68)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Junio C Hamano
   4#
   5
   6test_description='various format-patch tests'
   7
   8. ./test-lib.sh
   9. "$TEST_DIRECTORY"/lib-terminal.sh
  10
  11test_expect_success setup '
  12
  13        for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
  14        cat file >elif &&
  15        git add file elif &&
  16        test_tick &&
  17        git commit -m Initial &&
  18        git checkout -b side &&
  19
  20        for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
  21        test_chmod +x elif &&
  22        test_tick &&
  23        git commit -m "Side changes #1" &&
  24
  25        for i in D E F; do echo "$i"; done >>file &&
  26        git update-index file &&
  27        test_tick &&
  28        git commit -m "Side changes #2" &&
  29        git tag C2 &&
  30
  31        for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
  32        git update-index file &&
  33        test_tick &&
  34        git commit -m "Side changes #3 with \\n backslash-n in it." &&
  35
  36        git checkout master &&
  37        git diff-tree -p C2 | git apply --index &&
  38        test_tick &&
  39        git commit -m "Master accepts moral equivalent of #2"
  40
  41'
  42
  43test_expect_success "format-patch --ignore-if-in-upstream" '
  44
  45        git format-patch --stdout master..side >patch0 &&
  46        cnt=`grep "^From " patch0 | wc -l` &&
  47        test $cnt = 3
  48
  49'
  50
  51test_expect_success "format-patch --ignore-if-in-upstream" '
  52
  53        git format-patch --stdout \
  54                --ignore-if-in-upstream master..side >patch1 &&
  55        cnt=`grep "^From " patch1 | wc -l` &&
  56        test $cnt = 2
  57
  58'
  59
  60test_expect_success "format-patch doesn't consider merge commits" '
  61
  62        git checkout -b slave master &&
  63        echo "Another line" >>file &&
  64        test_tick &&
  65        git commit -am "Slave change #1" &&
  66        echo "Yet another line" >>file &&
  67        test_tick &&
  68        git commit -am "Slave change #2" &&
  69        git checkout -b merger master &&
  70        test_tick &&
  71        git merge --no-ff slave &&
  72        cnt=`git format-patch -3 --stdout | grep "^From " | wc -l` &&
  73        test $cnt = 3
  74'
  75
  76test_expect_success "format-patch result applies" '
  77
  78        git checkout -b rebuild-0 master &&
  79        git am -3 patch0 &&
  80        cnt=`git rev-list master.. | wc -l` &&
  81        test $cnt = 2
  82'
  83
  84test_expect_success "format-patch --ignore-if-in-upstream result applies" '
  85
  86        git checkout -b rebuild-1 master &&
  87        git am -3 patch1 &&
  88        cnt=`git rev-list master.. | wc -l` &&
  89        test $cnt = 2
  90'
  91
  92test_expect_success 'commit did not screw up the log message' '
  93
  94        git cat-file commit side | grep "^Side .* with .* backslash-n"
  95
  96'
  97
  98test_expect_success 'format-patch did not screw up the log message' '
  99
 100        grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
 101        grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
 102
 103'
 104
 105test_expect_success 'replay did not screw up the log message' '
 106
 107        git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
 108
 109'
 110
 111test_expect_success 'extra headers' '
 112
 113        git config format.headers "To: R E Cipient <rcipient@example.com>
 114" &&
 115        git config --add format.headers "Cc: S E Cipient <scipient@example.com>
 116" &&
 117        git format-patch --stdout master..side > patch2 &&
 118        sed -e "/^\$/q" patch2 > hdrs2 &&
 119        grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
 120        grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
 121
 122'
 123
 124test_expect_success 'extra headers without newlines' '
 125
 126        git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
 127        git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
 128        git format-patch --stdout master..side >patch3 &&
 129        sed -e "/^\$/q" patch3 > hdrs3 &&
 130        grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
 131        grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
 132
 133'
 134
 135test_expect_success 'extra headers with multiple To:s' '
 136
 137        git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
 138        git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
 139        git format-patch --stdout master..side > patch4 &&
 140        sed -e "/^\$/q" patch4 > hdrs4 &&
 141        grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
 142        grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
 143'
 144
 145test_expect_success 'additional command line cc (ascii)' '
 146
 147        git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
 148        git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
 149        grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
 150        grep "^ *S E Cipient <scipient@example.com>\$" patch5
 151'
 152
 153test_expect_failure 'additional command line cc (rfc822)' '
 154
 155        git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
 156        git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 &&
 157        grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 &&
 158        grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" patch5
 159'
 160
 161test_expect_success 'command line headers' '
 162
 163        git config --unset-all format.headers &&
 164        git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch6 &&
 165        grep "^Cc: R E Cipient <rcipient@example.com>\$" patch6
 166'
 167
 168test_expect_success 'configuration headers and command line headers' '
 169
 170        git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
 171        git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch7 &&
 172        grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch7 &&
 173        grep "^ *S E Cipient <scipient@example.com>\$" patch7
 174'
 175
 176test_expect_success 'command line To: header (ascii)' '
 177
 178        git config --unset-all format.headers &&
 179        git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
 180        grep "^To: R E Cipient <rcipient@example.com>\$" patch8
 181'
 182
 183test_expect_failure 'command line To: header (rfc822)' '
 184
 185        git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
 186        grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8
 187'
 188
 189test_expect_failure 'command line To: header (rfc2047)' '
 190
 191        git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
 192        grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8
 193'
 194
 195test_expect_success 'configuration To: header (ascii)' '
 196
 197        git config format.to "R E Cipient <rcipient@example.com>" &&
 198        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
 199        grep "^To: R E Cipient <rcipient@example.com>\$" patch9
 200'
 201
 202test_expect_failure 'configuration To: header (rfc822)' '
 203
 204        git config format.to "R. E. Cipient <rcipient@example.com>" &&
 205        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
 206        grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
 207'
 208
 209test_expect_failure 'configuration To: header (rfc2047)' '
 210
 211        git config format.to "R Ä Cipient <rcipient@example.com>" &&
 212        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
 213        grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9
 214'
 215
 216# check_patch <patch>: Verify that <patch> looks like a half-sane
 217# patch email to avoid a false positive with !grep
 218check_patch () {
 219        grep -e "^From:" "$1" &&
 220        grep -e "^Date:" "$1" &&
 221        grep -e "^Subject:" "$1"
 222}
 223
 224test_expect_success '--no-to overrides config.to' '
 225
 226        git config --replace-all format.to \
 227                "R E Cipient <rcipient@example.com>" &&
 228        git format-patch --no-to --stdout master..side |
 229        sed -e "/^\$/q" >patch10 &&
 230        check_patch patch10 &&
 231        ! grep "^To: R E Cipient <rcipient@example.com>\$" patch10
 232'
 233
 234test_expect_success '--no-to and --to replaces config.to' '
 235
 236        git config --replace-all format.to \
 237                "Someone <someone@out.there>" &&
 238        git format-patch --no-to --to="Someone Else <else@out.there>" \
 239                --stdout master..side |
 240        sed -e "/^\$/q" >patch11 &&
 241        check_patch patch11 &&
 242        ! grep "^To: Someone <someone@out.there>\$" patch11 &&
 243        grep "^To: Someone Else <else@out.there>\$" patch11
 244'
 245
 246test_expect_success '--no-cc overrides config.cc' '
 247
 248        git config --replace-all format.cc \
 249                "C E Cipient <rcipient@example.com>" &&
 250        git format-patch --no-cc --stdout master..side |
 251        sed -e "/^\$/q" >patch12 &&
 252        check_patch patch12 &&
 253        ! grep "^Cc: C E Cipient <rcipient@example.com>\$" patch12
 254'
 255
 256test_expect_success '--no-add-header overrides config.headers' '
 257
 258        git config --replace-all format.headers \
 259                "Header1: B E Cipient <rcipient@example.com>" &&
 260        git format-patch --no-add-header --stdout master..side |
 261        sed -e "/^\$/q" >patch13 &&
 262        check_patch patch13 &&
 263        ! grep "^Header1: B E Cipient <rcipient@example.com>\$" patch13
 264'
 265
 266test_expect_success 'multiple files' '
 267
 268        rm -rf patches/ &&
 269        git checkout side &&
 270        git format-patch -o patches/ master &&
 271        ls patches/0001-Side-changes-1.patch patches/0002-Side-changes-2.patch patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
 272'
 273
 274test_expect_success 'reroll count' '
 275        rm -fr patches &&
 276        git format-patch -o patches --cover-letter --reroll-count 4 master..side >list &&
 277        ! grep -v "^patches/v4-000[0-3]-" list &&
 278        sed -n -e "/^Subject: /p" $(cat list) >subjects &&
 279        ! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
 280'
 281
 282test_expect_success 'reroll count (-v)' '
 283        rm -fr patches &&
 284        git format-patch -o patches --cover-letter -v4 master..side >list &&
 285        ! grep -v "^patches/v4-000[0-3]-" list &&
 286        sed -n -e "/^Subject: /p" $(cat list) >subjects &&
 287        ! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
 288'
 289
 290check_threading () {
 291        expect="$1" &&
 292        shift &&
 293        (git format-patch --stdout "$@"; echo $? > status.out) |
 294        # Prints everything between the Message-ID and In-Reply-To,
 295        # and replaces all Message-ID-lookalikes by a sequence number
 296        perl -ne '
 297                if (/^(message-id|references|in-reply-to)/i) {
 298                        $printing = 1;
 299                } elsif (/^\S/) {
 300                        $printing = 0;
 301                }
 302                if ($printing) {
 303                        $h{$1}=$i++ if (/<([^>]+)>/ and !exists $h{$1});
 304                        for $k (keys %h) {s/$k/$h{$k}/};
 305                        print;
 306                }
 307                print "---\n" if /^From /i;
 308        ' > actual &&
 309        test 0 = "$(cat status.out)" &&
 310        test_cmp "$expect" actual
 311}
 312
 313cat >> expect.no-threading <<EOF
 314---
 315---
 316---
 317EOF
 318
 319test_expect_success 'no threading' '
 320        git checkout side &&
 321        check_threading expect.no-threading master
 322'
 323
 324cat > expect.thread <<EOF
 325---
 326Message-Id: <0>
 327---
 328Message-Id: <1>
 329In-Reply-To: <0>
 330References: <0>
 331---
 332Message-Id: <2>
 333In-Reply-To: <0>
 334References: <0>
 335EOF
 336
 337test_expect_success 'thread' '
 338        check_threading expect.thread --thread master
 339'
 340
 341cat > expect.in-reply-to <<EOF
 342---
 343Message-Id: <0>
 344In-Reply-To: <1>
 345References: <1>
 346---
 347Message-Id: <2>
 348In-Reply-To: <1>
 349References: <1>
 350---
 351Message-Id: <3>
 352In-Reply-To: <1>
 353References: <1>
 354EOF
 355
 356test_expect_success 'thread in-reply-to' '
 357        check_threading expect.in-reply-to --in-reply-to="<test.message>" \
 358                --thread master
 359'
 360
 361cat > expect.cover-letter <<EOF
 362---
 363Message-Id: <0>
 364---
 365Message-Id: <1>
 366In-Reply-To: <0>
 367References: <0>
 368---
 369Message-Id: <2>
 370In-Reply-To: <0>
 371References: <0>
 372---
 373Message-Id: <3>
 374In-Reply-To: <0>
 375References: <0>
 376EOF
 377
 378test_expect_success 'thread cover-letter' '
 379        check_threading expect.cover-letter --cover-letter --thread master
 380'
 381
 382cat > expect.cl-irt <<EOF
 383---
 384Message-Id: <0>
 385In-Reply-To: <1>
 386References: <1>
 387---
 388Message-Id: <2>
 389In-Reply-To: <0>
 390References: <1>
 391        <0>
 392---
 393Message-Id: <3>
 394In-Reply-To: <0>
 395References: <1>
 396        <0>
 397---
 398Message-Id: <4>
 399In-Reply-To: <0>
 400References: <1>
 401        <0>
 402EOF
 403
 404test_expect_success 'thread cover-letter in-reply-to' '
 405        check_threading expect.cl-irt --cover-letter \
 406                --in-reply-to="<test.message>" --thread master
 407'
 408
 409test_expect_success 'thread explicit shallow' '
 410        check_threading expect.cl-irt --cover-letter \
 411                --in-reply-to="<test.message>" --thread=shallow master
 412'
 413
 414cat > expect.deep <<EOF
 415---
 416Message-Id: <0>
 417---
 418Message-Id: <1>
 419In-Reply-To: <0>
 420References: <0>
 421---
 422Message-Id: <2>
 423In-Reply-To: <1>
 424References: <0>
 425        <1>
 426EOF
 427
 428test_expect_success 'thread deep' '
 429        check_threading expect.deep --thread=deep master
 430'
 431
 432cat > expect.deep-irt <<EOF
 433---
 434Message-Id: <0>
 435In-Reply-To: <1>
 436References: <1>
 437---
 438Message-Id: <2>
 439In-Reply-To: <0>
 440References: <1>
 441        <0>
 442---
 443Message-Id: <3>
 444In-Reply-To: <2>
 445References: <1>
 446        <0>
 447        <2>
 448EOF
 449
 450test_expect_success 'thread deep in-reply-to' '
 451        check_threading expect.deep-irt  --thread=deep \
 452                --in-reply-to="<test.message>" master
 453'
 454
 455cat > expect.deep-cl <<EOF
 456---
 457Message-Id: <0>
 458---
 459Message-Id: <1>
 460In-Reply-To: <0>
 461References: <0>
 462---
 463Message-Id: <2>
 464In-Reply-To: <1>
 465References: <0>
 466        <1>
 467---
 468Message-Id: <3>
 469In-Reply-To: <2>
 470References: <0>
 471        <1>
 472        <2>
 473EOF
 474
 475test_expect_success 'thread deep cover-letter' '
 476        check_threading expect.deep-cl --cover-letter --thread=deep master
 477'
 478
 479cat > expect.deep-cl-irt <<EOF
 480---
 481Message-Id: <0>
 482In-Reply-To: <1>
 483References: <1>
 484---
 485Message-Id: <2>
 486In-Reply-To: <0>
 487References: <1>
 488        <0>
 489---
 490Message-Id: <3>
 491In-Reply-To: <2>
 492References: <1>
 493        <0>
 494        <2>
 495---
 496Message-Id: <4>
 497In-Reply-To: <3>
 498References: <1>
 499        <0>
 500        <2>
 501        <3>
 502EOF
 503
 504test_expect_success 'thread deep cover-letter in-reply-to' '
 505        check_threading expect.deep-cl-irt --cover-letter \
 506                --in-reply-to="<test.message>" --thread=deep master
 507'
 508
 509test_expect_success 'thread via config' '
 510        test_config format.thread true &&
 511        check_threading expect.thread master
 512'
 513
 514test_expect_success 'thread deep via config' '
 515        test_config format.thread deep &&
 516        check_threading expect.deep master
 517'
 518
 519test_expect_success 'thread config + override' '
 520        test_config format.thread deep &&
 521        check_threading expect.thread --thread master
 522'
 523
 524test_expect_success 'thread config + --no-thread' '
 525        test_config format.thread deep &&
 526        check_threading expect.no-threading --no-thread master
 527'
 528
 529test_expect_success 'excessive subject' '
 530
 531        rm -rf patches/ &&
 532        git checkout side &&
 533        for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >>file &&
 534        git update-index file &&
 535        git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
 536        git format-patch -o patches/ master..side &&
 537        ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
 538'
 539
 540test_expect_success 'cover-letter inherits diff options' '
 541
 542        git mv file foo &&
 543        git commit -m foo &&
 544        git format-patch --cover-letter -1 &&
 545        check_patch 0000-cover-letter.patch &&
 546        ! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
 547        git format-patch --cover-letter -1 -M &&
 548        grep "file => foo .* 0 *\$" 0000-cover-letter.patch
 549
 550'
 551
 552cat > expect << EOF
 553  This is an excessively long subject line for a message due to the
 554    habit some projects have of not having a short, one-line subject at
 555    the start of the commit message, but rather sticking a whole
 556    paragraph right at the start as the only thing in the commit
 557    message. It had better not become the filename for the patch.
 558  foo
 559
 560EOF
 561
 562test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
 563
 564        git format-patch --cover-letter -2 &&
 565        sed -e "1,/A U Thor/d" -e "/^\$/q" < 0000-cover-letter.patch > output &&
 566        test_cmp expect output
 567
 568'
 569
 570cat > expect << EOF
 571index 40f36c6..2dc5c23 100644
 572--- a/file
 573+++ b/file
 574@@ -13,4 +13,20 @@ C
 575 10
 576 D
 577 E
 578 F
 579+5
 580EOF
 581
 582test_expect_success 'format-patch respects -U' '
 583
 584        git format-patch -U4 -2 &&
 585        sed -e "1,/^diff/d" -e "/^+5/q" \
 586                <0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
 587                >output &&
 588        test_cmp expect output
 589
 590'
 591
 592cat > expect << EOF
 593
 594diff --git a/file b/file
 595index 40f36c6..2dc5c23 100644
 596--- a/file
 597+++ b/file
 598@@ -14,3 +14,19 @@ C
 599 D
 600 E
 601 F
 602+5
 603EOF
 604
 605test_expect_success 'format-patch -p suppresses stat' '
 606
 607        git format-patch -p -2 &&
 608        sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output &&
 609        test_cmp expect output
 610
 611'
 612
 613test_expect_success 'format-patch from a subdirectory (1)' '
 614        filename=$(
 615                rm -rf sub &&
 616                mkdir -p sub/dir &&
 617                cd sub/dir &&
 618                git format-patch -1
 619        ) &&
 620        case "$filename" in
 621        0*)
 622                ;; # ok
 623        *)
 624                echo "Oops? $filename"
 625                false
 626                ;;
 627        esac &&
 628        test -f "$filename"
 629'
 630
 631test_expect_success 'format-patch from a subdirectory (2)' '
 632        filename=$(
 633                rm -rf sub &&
 634                mkdir -p sub/dir &&
 635                cd sub/dir &&
 636                git format-patch -1 -o ..
 637        ) &&
 638        case "$filename" in
 639        ../0*)
 640                ;; # ok
 641        *)
 642                echo "Oops? $filename"
 643                false
 644                ;;
 645        esac &&
 646        basename=$(expr "$filename" : ".*/\(.*\)") &&
 647        test -f "sub/$basename"
 648'
 649
 650test_expect_success 'format-patch from a subdirectory (3)' '
 651        rm -f 0* &&
 652        filename=$(
 653                rm -rf sub &&
 654                mkdir -p sub/dir &&
 655                cd sub/dir &&
 656                git format-patch -1 -o "$TRASH_DIRECTORY"
 657        ) &&
 658        basename=$(expr "$filename" : ".*/\(.*\)") &&
 659        test -f "$basename"
 660'
 661
 662test_expect_success 'format-patch --in-reply-to' '
 663        git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 &&
 664        grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
 665        grep "^References: <baz@foo.bar>" patch8
 666'
 667
 668test_expect_success 'format-patch --signoff' '
 669        git format-patch -1 --signoff --stdout >out &&
 670        grep "^Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" out
 671'
 672
 673test_expect_success 'format-patch --notes --signoff' '
 674        git notes --ref test add -m "test message" HEAD &&
 675        git format-patch -1 --signoff --stdout --notes=test >out &&
 676        # Three dashes must come after S-o-b
 677        ! sed "/^Signed-off-by: /q" out | grep "test message" &&
 678        sed "1,/^Signed-off-by: /d" out | grep "test message" &&
 679        # Notes message must come after three dashes
 680        ! sed "/^---$/q" out | grep "test message" &&
 681        sed "1,/^---$/d" out | grep "test message"
 682'
 683
 684echo "fatal: --name-only does not make sense" > expect.name-only
 685echo "fatal: --name-status does not make sense" > expect.name-status
 686echo "fatal: --check does not make sense" > expect.check
 687
 688test_expect_success 'options no longer allowed for format-patch' '
 689        test_must_fail git format-patch --name-only 2> output &&
 690        test_i18ncmp expect.name-only output &&
 691        test_must_fail git format-patch --name-status 2> output &&
 692        test_i18ncmp expect.name-status output &&
 693        test_must_fail git format-patch --check 2> output &&
 694        test_i18ncmp expect.check output'
 695
 696test_expect_success 'format-patch --numstat should produce a patch' '
 697        git format-patch --numstat --stdout master..side > output &&
 698        test 6 = $(grep "^diff --git a/" output | wc -l)'
 699
 700test_expect_success 'format-patch -- <path>' '
 701        git format-patch master..side -- file 2>error &&
 702        ! grep "Use .--" error
 703'
 704
 705test_expect_success 'format-patch --ignore-if-in-upstream HEAD' '
 706        git format-patch --ignore-if-in-upstream HEAD
 707'
 708
 709test_expect_success 'format-patch --signature' '
 710        git format-patch --stdout --signature="my sig" -1 >output &&
 711        grep "my sig" output
 712'
 713
 714test_expect_success 'format-patch with format.signature config' '
 715        git config format.signature "config sig" &&
 716        git format-patch --stdout -1 >output &&
 717        grep "config sig" output
 718'
 719
 720test_expect_success 'format-patch --signature overrides format.signature' '
 721        git config format.signature "config sig" &&
 722        git format-patch --stdout --signature="overrides" -1 >output &&
 723        ! grep "config sig" output &&
 724        grep "overrides" output
 725'
 726
 727test_expect_success 'format-patch --no-signature ignores format.signature' '
 728        git config format.signature "config sig" &&
 729        git format-patch --stdout --signature="my sig" --no-signature \
 730                -1 >output &&
 731        check_patch output &&
 732        ! grep "config sig" output &&
 733        ! grep "my sig" output &&
 734        ! grep "^-- \$" output
 735'
 736
 737test_expect_success 'format-patch --signature --cover-letter' '
 738        git config --unset-all format.signature &&
 739        git format-patch --stdout --signature="my sig" --cover-letter \
 740                -1 >output &&
 741        grep "my sig" output &&
 742        test 2 = $(grep "my sig" output | wc -l)
 743'
 744
 745test_expect_success 'format.signature="" suppresses signatures' '
 746        git config format.signature "" &&
 747        git format-patch --stdout -1 >output &&
 748        check_patch output &&
 749        ! grep "^-- \$" output
 750'
 751
 752test_expect_success 'format-patch --no-signature suppresses signatures' '
 753        git config --unset-all format.signature &&
 754        git format-patch --stdout --no-signature -1 >output &&
 755        check_patch output &&
 756        ! grep "^-- \$" output
 757'
 758
 759test_expect_success 'format-patch --signature="" suppresses signatures' '
 760        git format-patch --stdout --signature="" -1 >output &&
 761        check_patch output &&
 762        ! grep "^-- \$" output
 763'
 764
 765test_expect_success TTY 'format-patch --stdout paginates' '
 766        rm -f pager_used &&
 767        test_terminal env GIT_PAGER="wc >pager_used" git format-patch --stdout --all &&
 768        test_path_is_file pager_used
 769'
 770
 771 test_expect_success TTY 'format-patch --stdout pagination can be disabled' '
 772        rm -f pager_used &&
 773        test_terminal env GIT_PAGER="wc >pager_used" git --no-pager format-patch --stdout --all &&
 774        test_terminal env GIT_PAGER="wc >pager_used" git -c "pager.format-patch=false" format-patch --stdout --all &&
 775        test_path_is_missing pager_used &&
 776        test_path_is_missing .git/pager_used
 777'
 778
 779test_expect_success 'format-patch handles multi-line subjects' '
 780        rm -rf patches/ &&
 781        echo content >>file &&
 782        for i in one two three; do echo $i; done >msg &&
 783        git add file &&
 784        git commit -F msg &&
 785        git format-patch -o patches -1 &&
 786        grep ^Subject: patches/0001-one.patch >actual &&
 787        echo "Subject: [PATCH] one two three" >expect &&
 788        test_cmp expect actual
 789'
 790
 791test_expect_success 'format-patch handles multi-line encoded subjects' '
 792        rm -rf patches/ &&
 793        echo content >>file &&
 794        for i in en två tre; do echo $i; done >msg &&
 795        git add file &&
 796        git commit -F msg &&
 797        git format-patch -o patches -1 &&
 798        grep ^Subject: patches/0001-en.patch >actual &&
 799        echo "Subject: [PATCH] =?UTF-8?q?en=20tv=C3=A5=20tre?=" >expect &&
 800        test_cmp expect actual
 801'
 802
 803M8="foo bar "
 804M64=$M8$M8$M8$M8$M8$M8$M8$M8
 805M512=$M64$M64$M64$M64$M64$M64$M64$M64
 806cat >expect <<'EOF'
 807Subject: [PATCH] foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo
 808 bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar
 809 foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo
 810 bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar
 811 foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo
 812 bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar
 813 foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar
 814EOF
 815test_expect_success 'format-patch wraps extremely long subject (ascii)' '
 816        echo content >>file &&
 817        git add file &&
 818        git commit -m "$M512" &&
 819        git format-patch --stdout -1 >patch &&
 820        sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
 821        test_cmp expect subject
 822'
 823
 824M8="föö bar "
 825M64=$M8$M8$M8$M8$M8$M8$M8$M8
 826M512=$M64$M64$M64$M64$M64$M64$M64$M64
 827cat >expect <<'EOF'
 828Subject: [PATCH] =?UTF-8?q?f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?=
 829 =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?=
 830 =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?=
 831 =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?=
 832 =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?=
 833 =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?=
 834 =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?=
 835 =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?=
 836 =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?=
 837 =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?=
 838 =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?=
 839 =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?=
 840 =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?=
 841 =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?=
 842 =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?=
 843 =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?=
 844 =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?=
 845 =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?=
 846 =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?=
 847 =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?=
 848 =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?=
 849 =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?=
 850 =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?=
 851 =?UTF-8?q?bar?=
 852EOF
 853test_expect_success 'format-patch wraps extremely long subject (rfc2047)' '
 854        rm -rf patches/ &&
 855        echo content >>file &&
 856        git add file &&
 857        git commit -m "$M512" &&
 858        git format-patch --stdout -1 >patch &&
 859        sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
 860        test_cmp expect subject
 861'
 862
 863check_author() {
 864        echo content >>file &&
 865        git add file &&
 866        GIT_AUTHOR_NAME=$1 git commit -m author-check &&
 867        git format-patch --stdout -1 >patch &&
 868        sed -n "/^From: /p; /^ /p; /^$/q" <patch >actual &&
 869        test_cmp expect actual
 870}
 871
 872cat >expect <<'EOF'
 873From: "Foo B. Bar" <author@example.com>
 874EOF
 875test_expect_success 'format-patch quotes dot in from-headers' '
 876        check_author "Foo B. Bar"
 877'
 878
 879cat >expect <<'EOF'
 880From: "Foo \"The Baz\" Bar" <author@example.com>
 881EOF
 882test_expect_success 'format-patch quotes double-quote in from-headers' '
 883        check_author "Foo \"The Baz\" Bar"
 884'
 885
 886cat >expect <<'EOF'
 887From: =?UTF-8?q?F=C3=B6o=20Bar?= <author@example.com>
 888EOF
 889test_expect_success 'format-patch uses rfc2047-encoded from-headers when necessary' '
 890        check_author "Föo Bar"
 891'
 892
 893cat >expect <<'EOF'
 894From: =?UTF-8?q?F=C3=B6o=20B=2E=20Bar?= <author@example.com>
 895EOF
 896test_expect_success 'rfc2047-encoded from-headers leave no rfc822 specials' '
 897        check_author "Föo B. Bar"
 898'
 899
 900cat >expect <<EOF
 901From: foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_
 902 <author@example.com>
 903EOF
 904test_expect_success 'format-patch wraps moderately long from-header (ascii)' '
 905        check_author "foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_"
 906'
 907
 908cat >expect <<'EOF'
 909From: Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar
 910 Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo
 911 Bar Foo Bar Foo Bar Foo Bar <author@example.com>
 912EOF
 913test_expect_success 'format-patch wraps extremely long from-header (ascii)' '
 914        check_author "Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
 915'
 916
 917cat >expect <<'EOF'
 918From: "Foo.Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar
 919 Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo
 920 Bar Foo Bar Foo Bar Foo Bar" <author@example.com>
 921EOF
 922test_expect_success 'format-patch wraps extremely long from-header (rfc822)' '
 923        check_author "Foo.Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
 924'
 925
 926cat >expect <<'EOF'
 927From: =?UTF-8?q?Fo=C3=B6=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo?=
 928 =?UTF-8?q?=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20?=
 929 =?UTF-8?q?Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar?=
 930 =?UTF-8?q?=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20Foo=20Bar=20?=
 931 =?UTF-8?q?Foo=20Bar=20Foo=20Bar?= <author@example.com>
 932EOF
 933test_expect_success 'format-patch wraps extremely long from-header (rfc2047)' '
 934        check_author "Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
 935'
 936
 937cat >expect <<'EOF'
 938Subject: header with . in it
 939EOF
 940test_expect_success 'subject lines do not have 822 atom-quoting' '
 941        echo content >>file &&
 942        git add file &&
 943        git commit -m "header with . in it" &&
 944        git format-patch -k -1 --stdout >patch &&
 945        grep ^Subject: patch >actual &&
 946        test_cmp expect actual
 947'
 948
 949cat >expect <<'EOF'
 950Subject: [PREFIX 1/1] header with . in it
 951EOF
 952test_expect_success 'subject prefixes have space prepended' '
 953        git format-patch -n -1 --stdout --subject-prefix=PREFIX >patch &&
 954        grep ^Subject: patch >actual &&
 955        test_cmp expect actual
 956'
 957
 958cat >expect <<'EOF'
 959Subject: [1/1] header with . in it
 960EOF
 961test_expect_success 'empty subject prefix does not have extra space' '
 962        git format-patch -n -1 --stdout --subject-prefix= >patch &&
 963        grep ^Subject: patch >actual &&
 964        test_cmp expect actual
 965'
 966
 967test_expect_success '--from=ident notices bogus ident' '
 968        test_must_fail git format-patch -1 --stdout --from=foo >patch
 969'
 970
 971test_expect_success '--from=ident replaces author' '
 972        git format-patch -1 --stdout --from="Me <me@example.com>" >patch &&
 973        cat >expect <<-\EOF &&
 974        From: Me <me@example.com>
 975
 976        From: A U Thor <author@example.com>
 977
 978        EOF
 979        sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
 980        test_cmp expect patch.head
 981'
 982
 983test_expect_success '--from uses committer ident' '
 984        git format-patch -1 --stdout --from >patch &&
 985        cat >expect <<-\EOF &&
 986        From: C O Mitter <committer@example.com>
 987
 988        From: A U Thor <author@example.com>
 989
 990        EOF
 991        sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
 992        test_cmp expect patch.head
 993'
 994
 995test_expect_success '--from omits redundant in-body header' '
 996        git format-patch -1 --stdout --from="A U Thor <author@example.com>" >patch &&
 997        cat >expect <<-\EOF &&
 998        From: A U Thor <author@example.com>
 999
1000        EOF
1001        sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
1002        test_cmp expect patch.head
1003'
1004
1005test_expect_success 'in-body headers trigger content encoding' '
1006        GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
1007        test_when_finished "git reset --hard HEAD^" &&
1008        git format-patch -1 --stdout --from >patch &&
1009        cat >expect <<-\EOF &&
1010        From: C O Mitter <committer@example.com>
1011        Content-Type: text/plain; charset=UTF-8
1012
1013        From: éxötìc <author@example.com>
1014
1015        EOF
1016        sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" <patch >patch.head &&
1017        test_cmp expect patch.head
1018'
1019
1020append_signoff()
1021{
1022        C=$(git commit-tree HEAD^^{tree} -p HEAD) &&
1023        git format-patch --stdout --signoff $C^..$C >append_signoff.patch &&
1024        sed -n -e "1,/^---$/p" append_signoff.patch |
1025                egrep -n "^Subject|Sign|^$"
1026}
1027
1028test_expect_success 'signoff: commit with no body' '
1029        append_signoff </dev/null >actual &&
1030        cat <<\EOF | sed "s/EOL$//" >expected &&
10314:Subject: [PATCH] EOL
10328:
10339:Signed-off-by: C O Mitter <committer@example.com>
1034EOF
1035        test_cmp expected actual
1036'
1037
1038test_expect_success 'signoff: commit with only subject' '
1039        echo subject | append_signoff >actual &&
1040        cat >expected <<\EOF &&
10414:Subject: [PATCH] subject
10428:
10439:Signed-off-by: C O Mitter <committer@example.com>
1044EOF
1045        test_cmp expected actual
1046'
1047
1048test_expect_success 'signoff: commit with only subject that does not end with NL' '
1049        printf subject | append_signoff >actual &&
1050        cat >expected <<\EOF &&
10514:Subject: [PATCH] subject
10528:
10539:Signed-off-by: C O Mitter <committer@example.com>
1054EOF
1055        test_cmp expected actual
1056'
1057
1058test_expect_success 'signoff: no existing signoffs' '
1059        append_signoff <<\EOF >actual &&
1060subject
1061
1062body
1063EOF
1064        cat >expected <<\EOF &&
10654:Subject: [PATCH] subject
10668:
106710:
106811:Signed-off-by: C O Mitter <committer@example.com>
1069EOF
1070        test_cmp expected actual
1071'
1072
1073test_expect_success 'signoff: no existing signoffs and no trailing NL' '
1074        printf "subject\n\nbody" | append_signoff >actual &&
1075        cat >expected <<\EOF &&
10764:Subject: [PATCH] subject
10778:
107810:
107911:Signed-off-by: C O Mitter <committer@example.com>
1080EOF
1081        test_cmp expected actual
1082'
1083
1084test_expect_success 'signoff: some random signoff' '
1085        append_signoff <<\EOF >actual &&
1086subject
1087
1088body
1089
1090Signed-off-by: my@house
1091EOF
1092        cat >expected <<\EOF &&
10934:Subject: [PATCH] subject
10948:
109510:
109611:Signed-off-by: my@house
109712:Signed-off-by: C O Mitter <committer@example.com>
1098EOF
1099        test_cmp expected actual
1100'
1101
1102test_expect_success 'signoff: misc conforming footer elements' '
1103        append_signoff <<\EOF >actual &&
1104subject
1105
1106body
1107
1108Signed-off-by: my@house
1109(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
1110Tested-by: Some One <someone@example.com>
1111Bug: 1234
1112EOF
1113        cat >expected <<\EOF &&
11144:Subject: [PATCH] subject
11158:
111610:
111711:Signed-off-by: my@house
111815:Signed-off-by: C O Mitter <committer@example.com>
1119EOF
1120        test_cmp expected actual
1121'
1122
1123test_expect_success 'signoff: some random signoff-alike' '
1124        append_signoff <<\EOF >actual &&
1125subject
1126
1127body
1128Fooled-by-me: my@house
1129EOF
1130        cat >expected <<\EOF &&
11314:Subject: [PATCH] subject
11328:
113311:
113412:Signed-off-by: C O Mitter <committer@example.com>
1135EOF
1136        test_cmp expected actual
1137'
1138
1139test_expect_success 'signoff: not really a signoff' '
1140        append_signoff <<\EOF >actual &&
1141subject
1142
1143I want to mention about Signed-off-by: here.
1144EOF
1145        cat >expected <<\EOF &&
11464:Subject: [PATCH] subject
11478:
11489:I want to mention about Signed-off-by: here.
114910:
115011:Signed-off-by: C O Mitter <committer@example.com>
1151EOF
1152        test_cmp expected actual
1153'
1154
1155test_expect_success 'signoff: not really a signoff (2)' '
1156        append_signoff <<\EOF >actual &&
1157subject
1158
1159My unfortunate
1160Signed-off-by: example happens to be wrapped here.
1161EOF
1162        cat >expected <<\EOF &&
11634:Subject: [PATCH] subject
11648:
116510:Signed-off-by: example happens to be wrapped here.
116611:
116712:Signed-off-by: C O Mitter <committer@example.com>
1168EOF
1169        test_cmp expected actual
1170'
1171
1172test_expect_success 'signoff: valid S-o-b paragraph in the middle' '
1173        append_signoff <<\EOF >actual &&
1174subject
1175
1176Signed-off-by: my@house
1177Signed-off-by: your@house
1178
1179A lot of houses.
1180EOF
1181        cat >expected <<\EOF &&
11824:Subject: [PATCH] subject
11838:
11849:Signed-off-by: my@house
118510:Signed-off-by: your@house
118611:
118713:
118814:Signed-off-by: C O Mitter <committer@example.com>
1189EOF
1190        test_cmp expected actual
1191'
1192
1193test_expect_success 'signoff: the same signoff at the end' '
1194        append_signoff <<\EOF >actual &&
1195subject
1196
1197body
1198
1199Signed-off-by: C O Mitter <committer@example.com>
1200EOF
1201        cat >expected <<\EOF &&
12024:Subject: [PATCH] subject
12038:
120410:
120511:Signed-off-by: C O Mitter <committer@example.com>
1206EOF
1207        test_cmp expected actual
1208'
1209
1210test_expect_success 'signoff: the same signoff at the end, no trailing NL' '
1211        printf "subject\n\nSigned-off-by: C O Mitter <committer@example.com>" |
1212                append_signoff >actual &&
1213        cat >expected <<\EOF &&
12144:Subject: [PATCH] subject
12158:
12169:Signed-off-by: C O Mitter <committer@example.com>
1217EOF
1218        test_cmp expected actual
1219'
1220
1221test_expect_success 'signoff: the same signoff NOT at the end' '
1222        append_signoff <<\EOF >actual &&
1223subject
1224
1225body
1226
1227Signed-off-by: C O Mitter <committer@example.com>
1228Signed-off-by: my@house
1229EOF
1230        cat >expected <<\EOF &&
12314:Subject: [PATCH] subject
12328:
123310:
123411:Signed-off-by: C O Mitter <committer@example.com>
123512:Signed-off-by: my@house
1236EOF
1237        test_cmp expected actual
1238'
1239
1240test_expect_success 'signoff: detect garbage in non-conforming footer' '
1241        append_signoff <<\EOF >actual &&
1242subject
1243
1244body
1245
1246Tested-by: my@house
1247Some Trash
1248Signed-off-by: C O Mitter <committer@example.com>
1249EOF
1250        cat >expected <<\EOF &&
12514:Subject: [PATCH] subject
12528:
125310:
125413:Signed-off-by: C O Mitter <committer@example.com>
125514:
125615:Signed-off-by: C O Mitter <committer@example.com>
1257EOF
1258        test_cmp expected actual
1259'
1260
1261test_expect_success 'signoff: footer begins with non-signoff without @ sign' '
1262        append_signoff <<\EOF >actual &&
1263subject
1264
1265body
1266
1267Reviewed-id: Noone
1268Tested-by: my@house
1269Change-id: Ideadbeef
1270Signed-off-by: C O Mitter <committer@example.com>
1271Bug: 1234
1272EOF
1273        cat >expected <<\EOF &&
12744:Subject: [PATCH] subject
12758:
127610:
127714:Signed-off-by: C O Mitter <committer@example.com>
1278EOF
1279        test_cmp expected actual
1280'
1281
1282test_expect_success 'format patch ignores color.ui' '
1283        test_unconfig color.ui &&
1284        git format-patch --stdout -1 >expect &&
1285        test_config color.ui always &&
1286        git format-patch --stdout -1 >actual &&
1287        test_cmp expect actual
1288'
1289
1290test_expect_success 'cover letter using branch description (1)' '
1291        git checkout rebuild-1 &&
1292        test_config branch.rebuild-1.description hello &&
1293        git format-patch --stdout --cover-letter master >actual &&
1294        grep hello actual >/dev/null
1295'
1296
1297test_expect_success 'cover letter using branch description (2)' '
1298        git checkout rebuild-1 &&
1299        test_config branch.rebuild-1.description hello &&
1300        git format-patch --stdout --cover-letter rebuild-1~2..rebuild-1 >actual &&
1301        grep hello actual >/dev/null
1302'
1303
1304test_expect_success 'cover letter using branch description (3)' '
1305        git checkout rebuild-1 &&
1306        test_config branch.rebuild-1.description hello &&
1307        git format-patch --stdout --cover-letter ^master rebuild-1 >actual &&
1308        grep hello actual >/dev/null
1309'
1310
1311test_expect_success 'cover letter using branch description (4)' '
1312        git checkout rebuild-1 &&
1313        test_config branch.rebuild-1.description hello &&
1314        git format-patch --stdout --cover-letter master.. >actual &&
1315        grep hello actual >/dev/null
1316'
1317
1318test_expect_success 'cover letter using branch description (5)' '
1319        git checkout rebuild-1 &&
1320        test_config branch.rebuild-1.description hello &&
1321        git format-patch --stdout --cover-letter -2 HEAD >actual &&
1322        grep hello actual >/dev/null
1323'
1324
1325test_expect_success 'cover letter using branch description (6)' '
1326        git checkout rebuild-1 &&
1327        test_config branch.rebuild-1.description hello &&
1328        git format-patch --stdout --cover-letter -2 >actual &&
1329        grep hello actual >/dev/null
1330'
1331
1332test_expect_success 'cover letter with nothing' '
1333        git format-patch --stdout --cover-letter >actual &&
1334        test_line_count = 0 actual
1335'
1336
1337test_expect_success 'cover letter auto' '
1338        mkdir -p tmp &&
1339        test_when_finished "rm -rf tmp;
1340                git config --unset format.coverletter" &&
1341
1342        git config format.coverletter auto &&
1343        git format-patch -o tmp -1 >list &&
1344        test_line_count = 1 list &&
1345        git format-patch -o tmp -2 >list &&
1346        test_line_count = 3 list
1347'
1348
1349test_expect_success 'cover letter auto user override' '
1350        mkdir -p tmp &&
1351        test_when_finished "rm -rf tmp;
1352                git config --unset format.coverletter" &&
1353
1354        git config format.coverletter auto &&
1355        git format-patch -o tmp --cover-letter -1 >list &&
1356        test_line_count = 2 list &&
1357        git format-patch -o tmp --cover-letter -2 >list &&
1358        test_line_count = 3 list &&
1359        git format-patch -o tmp --no-cover-letter -1 >list &&
1360        test_line_count = 1 list &&
1361        git format-patch -o tmp --no-cover-letter -2 >list &&
1362        test_line_count = 2 list
1363'
1364
1365test_done