diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:40:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-22 16:40:26 -0800 |
| commit | 6d975c24a96d607061dbcf354a50dc8410ed4b55 (patch) | |
| tree | c94dcb149e3caa50db08c5b4fe4d360844e13a13 /t/t5100/sample.mbox | |
| parent | 4075d27a65e00e8eb5124b70a37f6d25c5b14d35 (diff) | |
| parent | d25e51596be9271ad833805a3d6f9012dc24ee79 (diff) | |
| download | git-6d975c24a96d607061dbcf354a50dc8410ed4b55.tar.gz git-6d975c24a96d607061dbcf354a50dc8410ed4b55.tar.xz | |
Merge branch 'ls/maint-mailinfo-no-inbody'
* ls/maint-mailinfo-no-inbody:
git am/mailinfo: Don't look at in-body headers when rebasing
Diffstat (limited to 't/t5100/sample.mbox')
| -rw-r--r-- | t/t5100/sample.mbox | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox index 13fa4ae03..de1031241 100644 --- a/t/t5100/sample.mbox +++ b/t/t5100/sample.mbox @@ -650,3 +650,36 @@ index b0b5d8f..461c47e 100644 convert_to_utf8(line, charset.buf); -- 1.6.4.1 +From nobody Mon Sep 17 00:00:00 2001 +From: A U Thor <a.u.thor@example.com> +Subject: check bogus body header (from) +Date: Fri, 9 Jun 2006 00:44:16 -0700 + +From: bogosity + - a list + - of stuff +--- +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++content + +From nobody Mon Sep 17 00:00:00 2001 +From: A U Thor <a.u.thor@example.com> +Subject: check bogus body header (date) +Date: Fri, 9 Jun 2006 00:44:16 -0700 + +Date: bogus + +and some content + +--- +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++content + |