X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-applymbox.sh;h=5569fdcc3463b214411d5a168a00783b0d390044;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=4e77132ab5f73839241c430d6354d5abb8294d85;hpb=d5b0c9ea178dab3599674ccff50645c0464b8c31;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 4e77132a..5569fdcc 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -15,13 +15,13 @@
 ## Pay a special attention to the commit log message if you do this and
 ## use a Signoff_file, because applypatch wants to append the sign-off
 ## message to msg-clean every time it is run.
+##
+## git-am is supposed to be the newer and better tool for this job.
 
-. git-sh-setup || die "Not a git archive"
+USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
+. git-sh-setup
 
-usage () {
-    echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
-    exit 1
-}
+git var GIT_COMMITTER_IDENT >/dev/null || exit
 
 keep_subject= query_apply= continue= utf8= resume=t
 while case "$#" in 0) break ;; esac
@@ -31,7 +31,7 @@ do
 	-k)	keep_subject=-k ;;
 	-q)	query_apply=t ;;
 	-c)	continue="$2"; resume=f; shift ;;
-	-m)	fallback_3way=t ;;
+	-m)	fall_back_3way=t ;;
 	-*)	usage ;;
 	*)	break ;;
 	esac