From d25e51596be9271ad833805a3d6f9012dc24ee79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Sandstr=C3=B6m?= Date: Fri, 20 Nov 2009 17:12:47 +0100 Subject: git am/mailinfo: Don't look at in-body headers when rebasing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- t/t5100/patch0016--no-inbody-headers | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 t/t5100/patch0016--no-inbody-headers (limited to 't/t5100/patch0016--no-inbody-headers') diff --git a/t/t5100/patch0016--no-inbody-headers b/t/t5100/patch0016--no-inbody-headers new file mode 100644 index 0000000000..ad64848873 --- /dev/null +++ b/t/t5100/patch0016--no-inbody-headers @@ -0,0 +1,8 @@ +--- +diff --git a/foo b/foo +index e69de29..d95f3ad 100644 +--- a/foo ++++ b/foo +@@ -0,0 +1 @@ ++content + -- cgit v1.2.3