git-am: should work when "--no-utf8 --utf8" is given

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

diff --git a/git-am.sh b/git-am.sh
index d9eb79d1aa8dccf18fa0df89abdc5d3fdfd2aa24..abd32a8b1cc27ae26a89b6e6aa9561e862e3e688 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -128,7 +128,7 @@ do
        -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
        sign=t; shift ;;
        -u|--u|--ut|--utf|--utf8)
-       shift ;; # this is now default
+       utf8=t; shift ;; # this is now default
        --no-u|--no-ut|--no-utf|--no-utf8)
        utf8=; shift ;;
        -k|--k|--ke|--kee|--keep)