Merge branch 'vd/fsck-submodule-url-test'

[thirdparty/git.git] / builtin / push.c

diff --git a/builtin/push.c b/builtin/push.c
index 6ec61657254446ece113838c3282e6b5f376efe8..2fbb31c3ad8eb9b7a15ffac4e5d9aa65367d298f 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -7,7 +7,6 @@
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
-#include "refs.h"
 #include "refspec.h"
 #include "run-command.h"
 #include "remote.h"
@@ -392,7 +391,7 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
        if (!is_empty_cas(&cas)) {
                if (!transport->smart_options)
                        die("underlying transport does not support --%s option",
-                           CAS_OPT_NAME);
+                           "force-with-lease");
                transport->smart_options->cas = &cas;
        }
 
@@ -599,7 +598,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),
                OPT_BIT( 0,  "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
                OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
-               OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
+               OPT_CALLBACK_F(0, "force-with-lease", &cas, N_("<refname>:<expect>"),
                               N_("require old value of ref to be at this value"),
                               PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option),
                OPT_BIT(0, TRANS_OPT_FORCE_IF_INCLUDES, &flags,