diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:57:12 -0700 |
| commit | 4cff50b3fb50940e57dc10769b2f92d5cec1a05a (patch) | |
| tree | 94ff1cf727557623e3b68fb4b3efbfce4e1e2766 /t/t5100/patch0018--no-inbody-headers | |
| parent | Fifth batch for 2.11 (diff) | |
| parent | mailinfo: handle in-body header continuations (diff) | |
| download | tgif-4cff50b3fb50940e57dc10769b2f92d5cec1a05a.tar.xz | |
Merge branch 'jt/mailinfo-fold-in-body-headers'
When "git format-patch --stdout" output is placed as an in-body
header and it uses the RFC2822 header folding, "git am" failed to
put the header line back into a single logical line. The
underlying "git mailinfo" was taught to handle this properly.
* jt/mailinfo-fold-in-body-headers:
mailinfo: handle in-body header continuations
mailinfo: make is_scissors_line take plain char *
mailinfo: separate in-body header processing
Diffstat (limited to 't/t5100/patch0018--no-inbody-headers')
| -rw-r--r-- | t/t5100/patch0018--no-inbody-headers | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t5100/patch0018--no-inbody-headers b/t/t5100/patch0018--no-inbody-headers new file mode 100644 index 0000000000..789df6d030 --- /dev/null +++ b/t/t5100/patch0018--no-inbody-headers @@ -0,0 +1,6 @@ +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++content |