From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 Jan 2007 05:20:01 +0000 (-0800)
Subject: -u is now default for 'git-applymbox'
X-Git-Tag: v1.5.0-rc1~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62c89c662fc6220522adc009aa95b1392350ed20;p=git.git

-u is now default for 'git-applymbox'

It has '-n' to disable it just in case, but do not even bother
documenting it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt
index f74c6a49b..95dc65a58 100644
--- a/Documentation/git-applymbox.txt
+++ b/Documentation/git-applymbox.txt
@@ -42,13 +42,13 @@ OPTIONS
 	and the current tree.
 
 -u::
-	By default, the commit log message, author name and
-	author email are taken from the e-mail without any
-	charset conversion, after minimally decoding MIME
-	transfer encoding.  This flag causes the resulting
-	commit to be encoded in utf-8 by transliterating them.
-	Note that the patch is always used as is without charset
-	conversion, even with this flag.
+	The commit log message, author name and author email are
+	taken from the e-mail, and after minimally decoding MIME
+	transfer encoding, re-coded in UTF-8 by transliterating
+	them.  This used to be optional but now it is the default.
++
+Note that the patch is always used as-is without charset
+conversion, even with this flag.
 
 -c .dotest/<num>::
 	When the patch contained in an e-mail does not cleanly
diff --git a/git-applymbox.sh b/git-applymbox.sh
index 5569fdcc3..7e690a16e 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -23,11 +23,12 @@ USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
 
 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= ;;
 	-k)	keep_subject=-k ;;
 	-q)	query_apply=t ;;
 	-c)	continue="$2"; resume=f; shift ;;