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

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>

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 910457d3b388f2c3b1dbe25f5609e3584fb4f113..53e81cb103c4fbd65c1c728fccd710a301eed5e4 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -9,7 +9,7 @@ git-am - Apply a series of patches in a mailbox
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
+'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way]

          [--interactive] [--whitespace=<option>] <mbox>...
 'git-am' [--skip | --resolved]
 
          [--interactive] [--whitespace=<option>] <mbox>...
 'git-am' [--skip | --resolved]
 


@@ -29,8 +29,21 @@ OPTIONS
        Instead of `.dotest` directory, use <dir> as a working
        area to store extracted patches.
 
        Instead of `.dotest` directory, use <dir> as a working
        area to store extracted patches.
 

---utf8, --keep::
-       Pass `-u` and `-k` flags to `git-mailinfo` (see
+--keep::
+       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]).
 
 --binary::
        gitlink:git-mailinfo[1]).
 
 --binary::

diff --git a/git-am.sh b/git-am.sh
index 7c0bb6084b332db7f7b6b9058db4d92b828730f0..d9eb79d1aa8dccf18fa0df89abdc5d3fdfd2aa24 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -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>...
   or, when resuming [--skip | --resolved]'
 . git-sh-setup
   [--interactive] [--whitespace=<option>] <mbox>...
   or, when resuming [--skip | --resolved]'
 . 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
 do
 
 while case "$#" in 0) break;; esac
 do


@@ -128,7 +128,9 @@ do
        -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
        sign=t; shift ;;
        -u|--u|--ut|--utf|--utf8)
        -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
        sign=t; shift ;;
        -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)
        keep=t; shift ;;
 
        -k|--k|--ke|--kee|--keep)
        keep=t; shift ;;