mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

--utf8 is now default for 'git-am'

Browse Source 
Since we are talking about allowing potentially incompatible UI
changes in v1.5.0 iff the change improves the general situation,
I would say why not.

There is --no-utf8 flag to avoid re-coding from botching the log
message just in case, but we may not even need it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-08 13:59:15 -08:00
parent 521f9c4def
commit d84029b673
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Documentation/git-am.txt
View File

@ -9,7 +9,7 @@ git-am - Apply a series of patches in a mailbox
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] 'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
[--interactive] [--whitespace=<option>] <mbox>... [--interactive] [--whitespace=<option>] <mbox>...
'git-am' [--skip | --resolved] 'git-am' [--skip | --resolved]
@ -29,8 +29,21 @@ OPTIONS
Instead of `.dotest` directory, use <dir> as a working Instead of `.dotest` directory, use <dir> as a working
area to store extracted patches. area to store extracted patches.
--utf8, --keep:: --keep::
Pass `-u` and `-k` flags to `git-mailinfo` (see Pass `-k` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
--utf8::
Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]).
The proposed commit log message taken from the e-mail
are re-coded into UTF-8 encoding (configuration variable
`i18n.commitencoding` can be used to specify project's
preferred encoding if it is not UTF-8).
+
This was optional in prior versions of git, but now it is the
default. You could use `--no-utf8` to override this.
--no-utf8::
Do not pass `-u` flag to `git-mailinfo` (see
gitlink:git-mailinfo[1]). gitlink:git-mailinfo[1]).
--binary:: --binary::

8
git-am.sh
View File

@ -2,7 +2,7 @@
# #
# Copyright (c) 2005, 2006 Junio C Hamano # Copyright (c) 2005, 2006 Junio C Hamano
USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]
[--interactive] [--whitespace=<option>] <mbox>... [--interactive] [--whitespace=<option>] <mbox>...
or, when resuming [--skip | --resolved]' or, when resuming [--skip | --resolved]'
. git-sh-setup . git-sh-setup
@ -105,7 +105,7 @@ It does not apply to blobs recorded in its index."
} }
prec=4 prec=4
dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg= dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= ws= resolvemsg=
while case "$#" in 0) break;; esac while case "$#" in 0) break;; esac
do do
@ -128,7 +128,9 @@ do
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff) -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
sign=t; shift ;; sign=t; shift ;;
-u|--u|--ut|--utf|--utf8) -u|--u|--ut|--utf|--utf8)
utf8=t; shift ;; shift ;; # this is now default
--no-u|--no-ut|--no-utf|--no-utf8)
utf8=; shift ;;
-k|--k|--ke|--kee|--keep) -k|--k|--ke|--kee|--keep)
keep=t; shift ;; keep=t; shift ;;