X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-applymbox.sh;h=1f68599ae51a671f8c7a3a01c6aa9c6b205dd217;hb=b6936205e73c058784288d21d1937e5bba26b91b;hp=6de6932879e9f1298f69e2826f13e1ee231ecea0;hpb=8fc66df237afce0b4318657f166b3583831949f3;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 6de693287..1f68599ae 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -18,22 +18,21 @@
 ##
 ## git-am is supposed to be the newer and better tool for this job.
 
-. git-sh-setup || die "Not a git archive"
+USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
+. git-sh-setup
 
-usage () {
-    echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
-    exit 1
-}
+git var GIT_COMMITTER_IDENT >/dev/null || exit
 
-keep_subject= query_apply= continue= utf8= resume=t
+keep_subject= query_apply= continue= utf8=-u resume=t
 while case "$#" in 0) break ;; esac
 do
 	case "$1" in
 	-u)	utf8=-u ;;
+	-n)	utf8=-n ;;
 	-k)	keep_subject=-k ;;
 	-q)	query_apply=t ;;
 	-c)	continue="$2"; resume=f; shift ;;
-	-m)	fallback_3way=t ;;
+	-m)	fall_back_3way=t ;;
 	-*)	usage ;;
 	*)	break ;;
 	esac