summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/de.po30
-rw-r--r--po/fr.po33
-rw-r--r--po/ja.po33
-rw-r--r--po/quilt.pot30
-rw-r--r--quilt.changes7
-rw-r--r--quilt/mail.in66
-rw-r--r--test/mail.test14
-rw-r--r--test/test.quiltrc2
8 files changed, 136 insertions, 79 deletions
diff --git a/po/de.po b/po/de.po
index 8cee319..8cf0e5a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -322,7 +322,7 @@ msgstr ""
"Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden."
"\\n"
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:368
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:391
msgid "Patch %s not applied before patch %s\\n"
msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
@@ -475,7 +475,7 @@ msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
msgid "Fork of patch %s to patch %s failed\\n"
msgstr "Fehler beim Aufspalten von %s auf %s\\n"
-#: quilt/fork.in:102 quilt/refresh.in:341
+#: quilt/fork.in:102 quilt/refresh.in:340
msgid "Fork of patch %s created as %s\\n"
msgstr "Neue Version von %s erstellt als %s\\n"
@@ -720,7 +720,7 @@ msgstr "Importiere Patch %s (abgelegt als %s)\\n"
msgid "Failed to import patch %s\\n"
msgstr "Konnte Patch %s nicht importieren\\n"
-#: quilt/import.in:222 quilt/refresh.in:328
+#: quilt/import.in:222 quilt/refresh.in:327
msgid "Failed to insert patch %s into file series\\n"
msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
@@ -773,6 +773,10 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--signature file\n"
+"\tAppend the specified signature to messages (defaults to ~/.signature\n"
+"\tif found; use \\`-' for no signature).\n"
+"\n"
"--reply-to message\n"
"\tAdd the appropriate headers to reply to the specified message.\n"
msgstr ""
@@ -810,33 +814,33 @@ msgstr ""
"--to, --cc, --bcc\n"
"\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n"
-#: quilt/mail.in:236
+#: quilt/mail.in:257
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
"Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender."
-#: quilt/mail.in:398
+#: quilt/mail.in:421
msgid "Unable to extract a subject header from %s\\n"
msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n"
-#: quilt/mail.in:421
+#: quilt/mail.in:445
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n"
-#: quilt/mail.in:430
+#: quilt/mail.in:454
#, fuzzy
msgid "File %s does not exist\\n"
msgstr "Patch %s existiert nicht\\n"
-#: quilt/mail.in:502
+#: quilt/mail.in:515
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
-#: quilt/mail.in:505
+#: quilt/mail.in:518
msgid "Introduction has no subject header\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
-#: quilt/mail.in:594
+#: quilt/mail.in:614
msgid "Introduction saved as %s\\n"
msgstr "Einleitung gespeichert als %s\\n"
@@ -871,7 +875,7 @@ msgstr ""
msgid "Patch %s exists already\\n"
msgstr "Patch %s existiert bereits\\n"
-#: quilt/new.in:81 quilt/refresh.in:337
+#: quilt/new.in:81 quilt/refresh.in:336
msgid "Failed to create patch %s\\n"
msgstr "Konnte Patch %s nicht erzeugen\\n"
@@ -1245,11 +1249,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr "Patch %s ist leer\\n"
-#: quilt/refresh.in:319
+#: quilt/refresh.in:318
msgid "Patch %s is unchanged\\n"
msgstr "Patch %s ist unverändert\\n"
-#: quilt/refresh.in:345
+#: quilt/refresh.in:344
msgid "Refreshed patch %s\\n"
msgstr "Patch %s aktualisiert\\n"
diff --git a/po/fr.po b/po/fr.po
index d21e15c..469fb3c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -324,7 +324,7 @@ msgstr ""
"Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 "
"la place\\n"
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:367
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:391
msgid "Patch %s not applied before patch %s\\n"
msgstr "Le patch %s n'est pas appliqu avant %s\\n."
@@ -472,7 +472,7 @@ msgstr "Le patch %s existe dj, veuillez choisir un nouveau nom\\n"
msgid "Fork of patch %s to patch %s failed\\n"
msgstr "Le fork de %s en %s a chou\\n"
-#: quilt/fork.in:102 quilt/refresh.in:341
+#: quilt/fork.in:102 quilt/refresh.in:340
msgid "Fork of patch %s created as %s\\n"
msgstr "Le fork de %s a t cr en tant que %s\\n"
@@ -716,7 +716,7 @@ msgstr "Import du patch %s (enregistr dans %s)\\n"
msgid "Failed to import patch %s\\n"
msgstr "Impossible d'importer le patch %s\\n"
-#: quilt/import.in:222 quilt/refresh.in:328
+#: quilt/import.in:222 quilt/refresh.in:327
msgid "Failed to insert patch %s into file series\\n"
msgstr "Impossible d'inserer %s dans le fichier de srie.\\n"
@@ -768,6 +768,10 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--signature file\n"
+"\tAppend the specified signature to messages (defaults to ~/.signature\n"
+"\tif found; use \\`-' for no signature).\n"
+"\n"
"--reply-to message\n"
"\tAdd the appropriate headers to reply to the specified message.\n"
msgstr ""
@@ -807,33 +811,33 @@ msgstr ""
"\tAjoute un destinataire dans le champ d'en-tte A, Copie ou Copie\n"
"\tcache, respectivement.\n"
-#: quilt/mail.in:235
+#: quilt/mail.in:257
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr "Impossible de dterminer l'adresse d'expditeur. Utilisez --sender."
-#: quilt/mail.in:397
+#: quilt/mail.in:421
msgid "Unable to extract a subject header from %s\\n"
msgstr "Impossible d'extraire une ligne de sujet de %s\\n"
-#: quilt/mail.in:420
+#: quilt/mail.in:445
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Les patches %s ont des sujets dupliqus.\\n"
-#: quilt/mail.in:429
+#: quilt/mail.in:454
#, fuzzy
msgid "File %s does not exist\\n"
msgstr "Le patch %s n'existe pas\\n"
-#: quilt/mail.in:486
+#: quilt/mail.in:515
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr ""
"L'introduction n'a pas de ligne de sujet (sauvegard en tant que %s)\\n"
-#: quilt/mail.in:489
+#: quilt/mail.in:518
msgid "Introduction has no subject header\\n"
msgstr "L'introduction ne contient pas de ligne de sujet\\n"
-#: quilt/mail.in:578
+#: quilt/mail.in:614
msgid "Introduction saved as %s\\n"
msgstr "Introduction sauvegarde en tant que %s\\n"
@@ -842,10 +846,11 @@ msgid "Usage: quilt new {patchname}\\n"
msgstr "Usage : quilt new {nom_de_patch}\\n"
#: quilt/new.in:25
+#, fuzzy
msgid ""
"\n"
"Create a new patch with the specified file name, and insert it after the\n"
-"topmost patch in the patch series file.\n"
+"topmost patch.\n"
"\n"
"Quilt can be used in sub-directories of a source tree. It determines the\n"
"root of a source tree by searching for a %s directory above the\n"
@@ -867,7 +872,7 @@ msgstr ""
msgid "Patch %s exists already\\n"
msgstr "Le patch %s existe dj\\n"
-#: quilt/new.in:81 quilt/refresh.in:337
+#: quilt/new.in:81 quilt/refresh.in:336
msgid "Failed to create patch %s\\n"
msgstr "Impossible de crer le patch %s\\n"
@@ -1252,11 +1257,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr "Le patch %s ne contient rien\\n"
-#: quilt/refresh.in:319
+#: quilt/refresh.in:318
msgid "Patch %s is unchanged\\n"
msgstr "Patch %s inchang\\n"
-#: quilt/refresh.in:345
+#: quilt/refresh.in:344
msgid "Refreshed patch %s\\n"
msgstr "Patch %s rafrachi\\n"
diff --git a/po/ja.po b/po/ja.po
index 9e4b444..e559ec4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -312,7 +312,7 @@ msgstr ""
msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n"
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:367
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:391
msgid "Patch %s not applied before patch %s\\n"
msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
@@ -453,7 +453,7 @@ msgstr "パッチ %s はすでに存在します。新しい名前を選んで
msgid "Fork of patch %s to patch %s failed\\n"
msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n"
-#: quilt/fork.in:102 quilt/refresh.in:341
+#: quilt/fork.in:102 quilt/refresh.in:340
msgid "Fork of patch %s created as %s\\n"
msgstr "パッチ %s の分岐で %s が作成されました\\n"
@@ -690,7 +690,7 @@ msgstr "パッチ %s を取り込んでいます (%s として保存されます
msgid "Failed to import patch %s\\n"
msgstr "パッチ %s の取り込みに失敗しました\\n"
-#: quilt/import.in:222 quilt/refresh.in:328
+#: quilt/import.in:222 quilt/refresh.in:327
msgid "Failed to insert patch %s into file series\\n"
msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
@@ -742,6 +742,10 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--signature file\n"
+"\tAppend the specified signature to messages (defaults to ~/.signature\n"
+"\tif found; use \\`-' for no signature).\n"
+"\n"
"--reply-to message\n"
"\tAdd the appropriate headers to reply to the specified message.\n"
msgstr ""
@@ -776,34 +780,34 @@ msgstr ""
"--to, --cc, --bcc\n"
"\tToやCC、BCCへの受信者の追加。\n"
-#: quilt/mail.in:235
+#: quilt/mail.in:257
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
"エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n"
"を使用してください。"
-#: quilt/mail.in:397
+#: quilt/mail.in:421
msgid "Unable to extract a subject header from %s\\n"
msgstr "%s から件名を取り出せません。\\n"
-#: quilt/mail.in:420
+#: quilt/mail.in:445
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "パッチ %s の件名が重複しています。\\n"
-#: quilt/mail.in:429
+#: quilt/mail.in:454
#, fuzzy
msgid "File %s does not exist\\n"
msgstr "パッチ %s が存在しません\\n"
-#: quilt/mail.in:486
+#: quilt/mail.in:515
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "序文に件名がありません(%s として保存されました)\\n"
-#: quilt/mail.in:489
+#: quilt/mail.in:518
msgid "Introduction has no subject header\\n"
msgstr "序文に件名がありません\\n"
-#: quilt/mail.in:578
+#: quilt/mail.in:614
msgid "Introduction saved as %s\\n"
msgstr "序文は %s という名前で保存されました\\n"
@@ -812,10 +816,11 @@ msgid "Usage: quilt new {patchname}\\n"
msgstr "使い方: quilt new {パッチ名}\\n"
#: quilt/new.in:25
+#, fuzzy
msgid ""
"\n"
"Create a new patch with the specified file name, and insert it after the\n"
-"topmost patch in the patch series file.\n"
+"topmost patch.\n"
"\n"
"Quilt can be used in sub-directories of a source tree. It determines the\n"
"root of a source tree by searching for a %s directory above the\n"
@@ -837,7 +842,7 @@ msgstr ""
msgid "Patch %s exists already\\n"
msgstr "パッチ %s は、すでに存在します\\n"
-#: quilt/new.in:81 quilt/refresh.in:337
+#: quilt/new.in:81 quilt/refresh.in:336
msgid "Failed to create patch %s\\n"
msgstr "パッチ %s の作成に失敗しました\\n"
@@ -1210,11 +1215,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr "パッチ %s にはなにも含まれていません\\n"
-#: quilt/refresh.in:319
+#: quilt/refresh.in:318
msgid "Patch %s is unchanged\\n"
msgstr "パッチ %s に変更はありません\\n"
-#: quilt/refresh.in:345
+#: quilt/refresh.in:344
msgid "Refreshed patch %s\\n"
msgstr "パッチ %s をリフレッシュしました\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 8320067..2276bca 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -206,7 +206,7 @@ msgstr ""
msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
msgstr ""
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:368
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:391
msgid "Patch %s not applied before patch %s\\n"
msgstr ""
@@ -311,7 +311,7 @@ msgstr ""
msgid "Fork of patch %s to patch %s failed\\n"
msgstr ""
-#: quilt/fork.in:102 quilt/refresh.in:341
+#: quilt/fork.in:102 quilt/refresh.in:340
msgid "Fork of patch %s created as %s\\n"
msgstr ""
@@ -472,7 +472,7 @@ msgstr ""
msgid "Failed to import patch %s\\n"
msgstr ""
-#: quilt/import.in:222 quilt/refresh.in:328
+#: quilt/import.in:222 quilt/refresh.in:327
msgid "Failed to insert patch %s into file series\\n"
msgstr ""
@@ -520,35 +520,39 @@ msgid ""
"--to, --cc, --bcc\n"
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
"\n"
+"--signature file\n"
+"\tAppend the specified signature to messages (defaults to ~/.signature\n"
+"\tif found; use \\`-' for no signature).\n"
+"\n"
"--reply-to message\n"
"\tAdd the appropriate headers to reply to the specified message.\n"
msgstr ""
-#: quilt/mail.in:236
+#: quilt/mail.in:257
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
-#: quilt/mail.in:398
+#: quilt/mail.in:421
msgid "Unable to extract a subject header from %s\\n"
msgstr ""
-#: quilt/mail.in:421
+#: quilt/mail.in:445
msgid "Patches %s have duplicate subject headers.\\n"
msgstr ""
-#: quilt/mail.in:430
+#: quilt/mail.in:454
msgid "File %s does not exist\\n"
msgstr ""
-#: quilt/mail.in:502
+#: quilt/mail.in:515
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr ""
-#: quilt/mail.in:505
+#: quilt/mail.in:518
msgid "Introduction has no subject header\\n"
msgstr ""
-#: quilt/mail.in:594
+#: quilt/mail.in:614
msgid "Introduction saved as %s\\n"
msgstr ""
@@ -573,7 +577,7 @@ msgstr ""
msgid "Patch %s exists already\\n"
msgstr ""
-#: quilt/new.in:81 quilt/refresh.in:337
+#: quilt/new.in:81 quilt/refresh.in:336
msgid "Failed to create patch %s\\n"
msgstr ""
@@ -826,11 +830,11 @@ msgstr ""
msgid "Nothing in patch %s\\n"
msgstr ""
-#: quilt/refresh.in:319
+#: quilt/refresh.in:318
msgid "Patch %s is unchanged\\n"
msgstr ""
-#: quilt/refresh.in:345
+#: quilt/refresh.in:344
msgid "Refreshed patch %s\\n"
msgstr ""
diff --git a/quilt.changes b/quilt.changes
index ea040c8..e31a9fd 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Oct 15 15:29:55 CEST 2007 - agruen@suse.de
+
+- quilt/main.in: Add a --signature flag that allows to override
+ the signature used. (The test suite still depended on the
+ .signature file of the user runnig it; fixed now.)
+
+-------------------------------------------------------------------
Sat Oct 6 22:15:19 CEST 2007 - agruen@suse.de
- Allow to define a MUA different from the one found at configure
diff --git a/quilt/mail.in b/quilt/mail.in
index 8d20a27..d7293d3 100644
--- a/quilt/mail.in
+++ b/quilt/mail.in
@@ -59,6 +59,10 @@ first, and a last patch name of \`-' denotes the last patch in the series.
--to, --cc, --bcc
Append a recipient to the To, Cc, or Bcc header.
+--signature file
+ Append the specified signature to messages (defaults to ~/.signature
+ if found; use \`-' for no signature).
+
--reply-to message
Add the appropriate headers to reply to the specified message.
" "@DOCSUBDIR@/README.MAIL"
@@ -123,7 +127,8 @@ process_mail()
--extract-recipients Cc \
--extract-recipients Bcc \
< $tmpfile)
- if [ -n "$opt_send" ]; then
+ if [ -n "$opt_send" ]
+ then
echo ${QUILT_SENDMAIL:-sendmail} \
${QUILT_SENDMAIL_ARGS--f "$opt_sender"} "$@"
$QUILT_DIR/scripts/edmail --charset $opt_charset \
@@ -141,7 +146,7 @@ process_mail()
options=`getopt -o m:h --long from:,to:,cc:,bcc:,subject: \
--long send,mbox:,charset:,sender: \
- --long prefix:,reply-to: -- "$@"`
+ --long prefix:,reply-to:,signature: -- "$@"`
if [ $? -ne 0 ]
then
@@ -151,6 +156,10 @@ fi
eval set -- "$options"
opt_prefix=patch
+if [ -r $HOME/.signature ]
+then
+ opt_signature="$(< $HOME/.signature)"
+fi
while true
do
@@ -191,6 +200,14 @@ do
--reply-to)
opt_reply_to=$2
shift 2 ;;
+ --signature)
+ if [ "$2" = - ]
+ then
+ opt_signature=
+ else
+ opt_signature=$(< "$2")
+ fi
+ shift 2 ;;
-h)
usage -h ;;
--)
@@ -204,7 +221,8 @@ then
usage
fi
-if [ $# -ge 1 ]; then
+if [ $# -ge 1 ]
+then
if [ "$1" = - ]
then
first_patch="$(find_first_patch)" || exit 1
@@ -212,7 +230,8 @@ if [ $# -ge 1 ]; then
first_patch="$(find_patch "$1")" || exit 1
fi
- if [ $# -ge 2 ]; then
+ if [ $# -ge 2 ]
+ then
if [ "$2" = - ]
then
last_patch="$(find_last_patch)" || exit 1
@@ -224,7 +243,8 @@ if [ $# -ge 1 ]; then
fi
fi
-if [ -z "$opt_sender" ]; then
+if [ -z "$opt_sender" ]
+then
hostname=$(hostname -f 2>/dev/null)
if [ "$hostname" = "${hostname/.}" ]
then
@@ -242,7 +262,8 @@ Could not determine the envelope sender address. Please use --sender." >&2
fi
opt_sender_address=$(echo "$opt_sender" | sed -re 's:.*<([^<>]+)>.*:\1:')
-if [ -z "$opt_charset" ]; then
+if [ -z "$opt_charset" ]
+then
case "${LC_ALL:-$ORIGINAL_LANG}" in
*.UTF-8)
opt_charset=UTF-8
@@ -253,7 +274,8 @@ if [ -z "$opt_charset" ]; then
esac
fi
-if [ "$(type -t quilt_mail_patch_filter 2> /dev/null)" != function ]; then
+if [ "$(type -t quilt_mail_patch_filter 2> /dev/null)" != function ]
+then
quilt_mail_patch_filter() {
local patch=$(cat)
local header=$(echo "$patch" | patch_header) body
@@ -418,7 +440,8 @@ dup_subjects=( $(
echo "$(print_patch "$patch")"
done
) )
-if [ ${#dup_subjects[@]} -ne 0 ]; then
+if [ ${#dup_subjects[@]} -ne 0 ]
+then
printf $"Patches %s have duplicate subject headers.\n" \
"$(set -- "${dup_subjects[*]/%/, }"; echo ${1%, })"
exit 1
@@ -467,16 +490,17 @@ introduction="$(gen_tempfile)"
echo "$opt_message"
echo
fi
- if [ -r $HOME/.signature ]
+ if [ -n "$opt_signature" ]
then
echo "-- "
- cat $HOME/.signature
+ echo "$opt_signature"
fi
) | $QUILT_DIR/scripts/edmail --charset $opt_charset > $introduction
if [ -z "$opt_message" ]
then
- if ! LANG=$ORIGINAL_LANG $EDITOR $introduction; then
+ if ! LANG=$ORIGINAL_LANG $EDITOR $introduction
+ then
rm -f $introduction
exit 1
fi
@@ -497,7 +521,8 @@ then
exit 1
fi
-if [ -n "$opt_mbox" ]; then
+if [ -n "$opt_mbox" ]
+then
exec 1> $opt_mbox
fi
@@ -515,7 +540,8 @@ $introduction \
--remove-empty-headers To Cc Bcc \
| process_mail
-if [ -n "$opt_mbox" ]; then
+if [ -n "$opt_mbox" ]
+then
exec 1>> $opt_mbox
fi
@@ -568,8 +594,12 @@ for patch in "${patches[@]}"; do
/^$/ { in_body = 1 }
{ print }
' $body
- echo -e '\n-- '
- [ -r $HOME/.signature ] && cat $HOME/.signature
+ echo
+ #if [ -n "$opt_signature" ]
+ #then
+ # echo '-- '
+ # echo "$opt_signature"
+ #fi
) | eval $QUILT_DIR/scripts/edmail --charset $opt_charset \
--replace-header Date="\"$new_date\"" \
To Cc Bcc \
@@ -579,7 +609,8 @@ for patch in "${patches[@]}"; do
| $QUILT_DIR/scripts/edmail --remove-empty-headers \
| process_mail
- if [ ${PIPESTATUS[1]} -ne 0 ]; then
+ if [ ${PIPESTATUS[1]} -ne 0 ]
+ then
printf $"Introduction saved as %s\n" "$introduction" >&2
exit 1
fi
@@ -588,7 +619,8 @@ for patch in "${patches[@]}"; do
# sequences.
#content_length=${#body}
- #if [ -n "$(echo "$body" | tr -d '\0-\177')" ]; then
+ #if [ -n "$(echo "$body" | tr -d '\0-\177')" ]
+ #then
# charset=UTF-8
#fi
# Content-Transfer-Encoding: 7bit
diff --git a/test/mail.test b/test/mail.test
index 86d8857..7812752 100644
--- a/test/mail.test
+++ b/test/mail.test
@@ -63,28 +63,28 @@
<
$ quilt mail --mbox mbox --prefix "test" --subject "This is a test" -m "Message"
- $ grep -e '^Subject:' -e '^To:' -e '^Cc:' -e '^-- $' -e '^ ' mbox
+ $ sed -nre "s/^(From [^ ]*).*/\\1/p" -e "/^Subject:/p" -e "/^To:/p" -e "/^Cc:/p" -e "/^ /p" mbox
+ > From a@b.c
> Subject: [test 0/5] This is a test
- > --
+ > From a@b.c
> Cc: Dummy <dummy@some.where>
> Subject: [test 1/5] Subject of 1.diff
- > --
+ > From a@b.c
> Cc: Dummy <dummy@some.where>
> Subject: [test 2/5] Subject of 2.diff is: split into multiple lines
- > --
+ > From a@b.c
> To: "John X. Doe" <jxd@some.where>
> Subject: [test 3/5] Subject of 3.diff
> To: John X. Doe <jxd@some.where>
- > --
+ > From a@b.c
> Cc: "Joe R. Hacker" <joe@foo.baz>,
> "John X. Doe" <jxd@some.where>,
> =?UTF-8?q?=C3=9C=20is=20an=20umlaut?= <used@in.german>
> Subject: [test 4/5] First paragraph used as subject of 4.diff.
> Cc: "John X. Doe" <jxd@some.where>
> Cc: Ü is an umlaut <used@in.german>
- > --
+ > From a@b.c
> Subject: [test 5/5] Subject of 5.diff
- > --
$ cd ..
$ rm -rf d
diff --git a/test/test.quiltrc b/test/test.quiltrc
index 62e8489..3c4a5c3 100644
--- a/test/test.quiltrc
+++ b/test/test.quiltrc
@@ -1,6 +1,6 @@
# Define this to generate diffs without timestamps.
QUILT_DIFF_ARGS="--no-timestamps"
QUILT_REFRESH_ARGS="--no-timestamps"
-QUILT_MAIL_ARGS="--charset=UTF-8 --sender a@b.c"
+QUILT_MAIL_ARGS="--charset=UTF-8 --sender a@b.c --signature=-"
QUILT_PATCHES_PREFIX=yes