path.c: refactor relative_path(), not only strip prefix

diff --git a/builtin/push.c b/builtin/push.c
index a2b3fbed6a4be128bbfc2c3f7c3b278a91680f80..909c34dfda984be86fba2013fedc3fdb10b5e2f1 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -228,8 +228,7 @@ static const char message_advice_ref_fetch_first[] =
           "See the 'Note about fast-forwards' in 'git push --help' for details.");
 
 static const char message_advice_ref_already_exists[] =
-       N_("Updates were rejected because the destination reference already exists\n"
-          "in the remote.");
+       N_("Updates were rejected because the tag already exists in the remote.");
 
 static const char message_advice_ref_needs_force[] =
        N_("You cannot update a remote ref that points at a non-commit object,\n"
@@ -323,7 +322,7 @@ static int push_with_options(struct transport *transport, int flags)
 static int do_push(const char *repo, int flags)
 {
        int i, errs;
-       struct remote *remote = remote_get(repo);
+       struct remote *remote = pushremote_get(repo);
        const char **url;
        int url_nr;
 
@@ -437,6 +436,9 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
                OPT_BIT(0, "prune", &flags, N_("prune locally removed refs"),
                        TRANSPORT_PUSH_PRUNE),
+               OPT_BIT(0, "no-verify", &flags, N_("bypass pre-push hook"), TRANSPORT_PUSH_NO_HOOK),
+               OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
+                       TRANSPORT_PUSH_FOLLOW_TAGS),
                OPT_END()
        };