Use symbolic name SHORT_NAME_AMBIGUOUS as error return value

[thirdparty/git.git] / git-applymbox.sh

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 4e77132ab5f73839241c430d6354d5abb8294d85..61c8c024c60935b4766b5052461b4c73918a69ec 100755 (executable)
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -15,13 +15,11 @@
 ## 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 () {
-    echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
-    exit 1
-}
+USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]'
+. git-sh-setup
 
 keep_subject= query_apply= continue= utf8= resume=t
 while case "$#" in 0) break ;; esac
@@ -31,7 +29,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