diff options
| author | Jean Delvare <khali@linux-fr.org> | 2006-09-05 13:52:40 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2006-09-05 13:52:40 +0000 |
| commit | ea6f88894706410ff48f36592de20ff3e4764437 (patch) | |
| tree | b794fa18ad20cd9d1a718409790cf26d2f1cd5e3 | |
| parent | 820f1e6e3278152b44c712c0fc62390e754041f2 (diff) | |
| download | quilt-ea6f88894706410ff48f36592de20ff3e4764437.tar.gz | |
- quilt/mail.in, test/mail.test: Fix signature separator. Patch
from Ville Syrjala.
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/mail.in | 4 | ||||
| -rw-r--r-- | test/mail.test | 14 |
3 files changed, 15 insertions, 9 deletions
diff --git a/quilt.changes b/quilt.changes index 72fbe01..abda791 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 5 15:50:00 CEST 2006 - khali@linux-fr.org + +- quilt/mail.in, test/mail.test: Fix signature separator. Patch + from Ville Syrjala. + +------------------------------------------------------------------- Wed Jun 28 01:29:39 CEST 2006 - agruen@suse.de - A few more `-p ab' fixes. diff --git a/quilt/mail.in b/quilt/mail.in index 99cf6e9..de6c883 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -348,7 +348,7 @@ introduction="$(gen_tempfile)" echo "$opt_message" echo fi - echo "--" + echo "-- " [ -r $HOME/.signature ] && cat $HOME/.signature ) | $QUILT_DIR/scripts/edmail --charset $opt_charset > $introduction @@ -447,7 +447,7 @@ for patch in "${patches[@]}"; do /^$/ { in_body = 1 } in_body { print } ' $body - echo -e '\n--' + echo -e '\n-- ' [ -r $HOME/.signature ] && cat $HOME/.signature ) | eval $QUILT_DIR/scripts/edmail --charset $opt_charset \ --replace-header Date="\"$new_date\"" \ diff --git a/test/mail.test b/test/mail.test index 361c5b0..86d8857 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 + $ grep -e '^Subject:' -e '^To:' -e '^Cc:' -e '^-- $' -e '^ ' mbox > Subject: [test 0/5] This is a test - > -- + > -- > Cc: Dummy <dummy@some.where> > Subject: [test 1/5] Subject of 1.diff - > -- + > -- > Cc: Dummy <dummy@some.where> > Subject: [test 2/5] Subject of 2.diff is: split into multiple lines - > -- + > -- > To: "John X. Doe" <jxd@some.where> > Subject: [test 3/5] Subject of 3.diff > To: John X. Doe <jxd@some.where> - > -- + > -- > 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> - > -- + > -- > Subject: [test 5/5] Subject of 5.diff - > -- + > -- $ cd .. $ rm -rf d |