diff options
| author |  Lukas Sandström <luksan@gmail.com> | 2009-11-20 17:12:47 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-20 23:14:02 -0800 |
| commit | d25e51596be9271ad833805a3d6f9012dc24ee79 (patch) | |
| tree | d0f40af3fc5da0c97602a2def6cdeeec10e71318 /t/t5100/sample.mbox | |
| parent | GIT 1.6.5 (diff) | |
| download | tgif-d25e51596be9271ad833805a3d6f9012dc24ee79.tar.xz | |
git am/mailinfo: Don't look at in-body headers when rebasing
When we are rebasing we know that the header lines in the
patch are good and that we don't need to pick up any headers
from the body of the patch.
This makes it possible to rebase commits whose commit message
start with "From" or "Date".
Test vectors by Jeff King.
Signed-off-by: Lukas Sandström <luksan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 13fa4ae03b..de1031241d 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 + |