git-merge: warn when -m provided on a fast forward

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 61c8c024c60935b4766b5052461b4c73918a69ec..1f68599ae51a671f8c7a3a01c6aa9c6b205dd217 100755 (executable)
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -21,11 +21,14 @@
 USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
 . git-sh-setup
 
-keep_subject= query_apply= continue= utf8= resume=t
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
+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 ;;