summaryrefslogtreecommitdiff
path: root/tools/git-applymbox
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-08-28 12:33:16 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-29 12:52:05 -0700
commitd4a9ce78f6d516568bfca4d808033d9e8254c33f (patch)
tree67d2068577ae13e59bb78f07cebec342727c5da6 /tools/git-applymbox
parentDocument "git cherry-pick" and "git revert" (diff)
downloadtgif-d4a9ce78f6d516568bfca4d808033d9e8254c33f.tar.xz
mailinfo and applymbox updates
This attempts to minimally cope with a subset of MIME "features" often seen in patches sent to our mailing lists. Namely: - People's name spelled in characters outside ASCII (both on From: header and the signed-off-by line). - Content-transfer-encoding using quoted-printable (both in multipart and non-multipart messages). These MIME features are detected and decoded by "git mailinfo". Optionally, with the '-u' flag, the output to .info and .msg is transliterated from its original chaset to utf-8. This is to encourage people to use utf8 in their commit messages for interoperability. Applymbox accepts additional flag '-u' which is passed to mailinfo. Signed-off-by: Junio C Hamano / 濱野 純 <junkio@cox.net>
Diffstat (limited to 'tools/git-applymbox')
-rwxr-xr-xtools/git-applymbox12
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/git-applymbox b/tools/git-applymbox
index afcb00a3f5..2b32dab5f5 100755
--- a/tools/git-applymbox
+++ b/tools/git-applymbox
@@ -9,7 +9,7 @@
## You give it a mbox-format collection of emails, and it will try to
## apply them to the kernel using "applypatch"
##
-## applymbox [ -k ] [ -q ] (-c .dotest/msg-number | mail_archive) [Signoff_file]"
+## applymbox [-u] [-k] [-q] (-c .dotest/msg-number | mail_archive) [Signoff_file]"
##
## The patch application may fail in the middle. In which case:
## (1) look at .dotest/patch and fix it up to apply
@@ -20,10 +20,16 @@
. git-sh-setup-script || die "Not a git archive"
-keep_subject= query_apply= continue= resume=t
+usage () {
+ echo >&2 "applymbox [-u] [-k] [-q] (-c .dotest/<num> | mbox) [signoff]"
+ exit 1
+}
+
+keep_subject= query_apply= continue= utf8= resume=t
while case "$#" in 0) break ;; esac
do
case "$1" in
+ -u) utf8=-u ;;
-k) keep_subject=-k ;;
-q) query_apply=t ;;
-c) continue="$2"; resume=f; shift ;;
@@ -64,7 +70,7 @@ do
f,$i) resume=t;;
f,*) continue;;
*)
- git-mailinfo $keep_subject \
+ git-mailinfo $keep_subject $utf8 \
.dotest/msg .dotest/patch <$i >.dotest/info || exit 1
git-stripspace < .dotest/msg > .dotest/msg-clean
;;