]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/mailinfo.c
git am/mailinfo: Don't look at in-body headers when rebasing
authorLukas Sandström <luksan@gmail.com>
Fri, 20 Nov 2009 16:12:47 +0000 (17:12 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:14:02 +0000 (23:14 -0800)
commitd25e51596be9271ad833805a3d6f9012dc24ee79
treed0f40af3fc5da0c97602a2def6cdeeec10e71318
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0
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>
16 files changed:
builtin-mailinfo.c
git-am.sh
t/t5100-mailinfo.sh
t/t5100/info0015 [new file with mode: 0644]
t/t5100/info0015--no-inbody-headers [new file with mode: 0644]
t/t5100/info0016 [new file with mode: 0644]
t/t5100/info0016--no-inbody-headers [new file with mode: 0644]
t/t5100/msg0015 [new file with mode: 0644]
t/t5100/msg0015--no-inbody-headers [new file with mode: 0644]
t/t5100/msg0016 [new file with mode: 0644]
t/t5100/msg0016--no-inbody-headers [new file with mode: 0644]
t/t5100/patch0015 [new file with mode: 0644]
t/t5100/patch0015--no-inbody-headers [new file with mode: 0644]
t/t5100/patch0016 [new file with mode: 0644]
t/t5100/patch0016--no-inbody-headers [new file with mode: 0644]
t/t5100/sample.mbox