mirror of
https://github.com/git/git.git
synced 2024-11-25 02:44:48 +08:00
2da1f36671
Since commit 81c5cf7 (mailinfo: skip bogus UNIX From line inside
body, 2006-05-21), we have treated lines like ">From" in the body as
headers. This makes "git am" work for people who erroneously paste
the whole output from format-patch:
From 12345abcd...fedcba543210 Mon Sep 17 00:00:00 2001
From: them
Subject: [PATCH] whatever
into their email body (assuming that an mbox writer then quotes
"From" as ">From", as otherwise we would actually mailsplit on the
in-body line).
However, this has false positives if somebody actually has a commit
body that starts with "From "; in this case we erroneously remove
the line entirely from the commit message. We can make this check
more robust by making sure the line actually looks like a real mbox
"From" line.
Inspect the line that begins with ">From " a more carefully to only
skip lines that match the expected pattern (note that the datestamp
part of the format-patch output is designed to be kept constant to
help those who write magic(5) entries).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
111 lines
3.1 KiB
Bash
Executable File
111 lines
3.1 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git mailinfo and git mailsplit test'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'split sample box' \
|
|
'git mailsplit -o. "$TEST_DIRECTORY"/t5100/sample.mbox >last &&
|
|
last=`cat last` &&
|
|
echo total is $last &&
|
|
test `cat last` = 17'
|
|
|
|
check_mailinfo () {
|
|
mail=$1 opt=$2
|
|
mo="$mail$opt"
|
|
git mailinfo -u $opt msg$mo patch$mo <$mail >info$mo &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/msg$mo msg$mo &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/patch$mo patch$mo &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/info$mo info$mo
|
|
}
|
|
|
|
|
|
for mail in `echo 00*`
|
|
do
|
|
test_expect_success "mailinfo $mail" '
|
|
check_mailinfo $mail "" &&
|
|
if test -f "$TEST_DIRECTORY"/t5100/msg$mail--scissors
|
|
then
|
|
check_mailinfo $mail --scissors
|
|
fi &&
|
|
if test -f "$TEST_DIRECTORY"/t5100/msg$mail--no-inbody-headers
|
|
then
|
|
check_mailinfo $mail --no-inbody-headers
|
|
fi
|
|
'
|
|
done
|
|
|
|
|
|
test_expect_success 'split box with rfc2047 samples' \
|
|
'mkdir rfc2047 &&
|
|
git mailsplit -orfc2047 "$TEST_DIRECTORY"/t5100/rfc2047-samples.mbox \
|
|
>rfc2047/last &&
|
|
last=`cat rfc2047/last` &&
|
|
echo total is $last &&
|
|
test `cat rfc2047/last` = 11'
|
|
|
|
for mail in `echo rfc2047/00*`
|
|
do
|
|
test_expect_success "mailinfo $mail" '
|
|
git mailinfo -u $mail-msg $mail-patch <$mail >$mail-info &&
|
|
echo msg &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/empty $mail-msg &&
|
|
echo patch &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/empty $mail-patch &&
|
|
echo info &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/rfc2047-info-$(basename $mail) $mail-info
|
|
'
|
|
done
|
|
|
|
test_expect_success 'respect NULs' '
|
|
|
|
git mailsplit -d3 -o. "$TEST_DIRECTORY"/t5100/nul-plain &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/nul-plain 001 &&
|
|
(cat 001 | git mailinfo msg patch) &&
|
|
test_line_count = 4 patch
|
|
|
|
'
|
|
|
|
test_expect_success 'Preserve NULs out of MIME encoded message' '
|
|
|
|
git mailsplit -d5 -o. "$TEST_DIRECTORY"/t5100/nul-b64.in &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/nul-b64.in 00001 &&
|
|
git mailinfo msg patch <00001 &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/nul-b64.expect patch
|
|
|
|
'
|
|
|
|
test_expect_success 'mailinfo on from header without name works' '
|
|
|
|
mkdir info-from &&
|
|
git mailsplit -oinfo-from "$TEST_DIRECTORY"/t5100/info-from.in &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/info-from.in info-from/0001 &&
|
|
git mailinfo info-from/msg info-from/patch \
|
|
<info-from/0001 >info-from/out &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/info-from.expect info-from/out
|
|
|
|
'
|
|
|
|
test_expect_success 'mailinfo finds headers after embedded From line' '
|
|
mkdir embed-from &&
|
|
git mailsplit -oembed-from "$TEST_DIRECTORY"/t5100/embed-from.in &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/embed-from.in embed-from/0001 &&
|
|
git mailinfo embed-from/msg embed-from/patch \
|
|
<embed-from/0001 >embed-from/out &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/embed-from.expect embed-from/out
|
|
'
|
|
|
|
test_expect_success 'mailinfo on message with quoted >From' '
|
|
mkdir quoted-from &&
|
|
git mailsplit -oquoted-from "$TEST_DIRECTORY"/t5100/quoted-from.in &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/quoted-from.in quoted-from/0001 &&
|
|
git mailinfo quoted-from/msg quoted-from/patch \
|
|
<quoted-from/0001 >quoted-from/out &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/quoted-from.expect quoted-from/msg
|
|
'
|
|
|
|
test_done
|