summaryrefslogtreecommitdiff
path: root/tools/git-applymbox
diff options
context:
space:
mode:
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 afcb00a..2b32dab 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
;;