Merge branch 'rs/remote-curl-use-argv-array'

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

diff --git a/builtin/push.c b/builtin/push.c
index 3742daf7b0235bfeca94eac8ef098751b300d45a..843f5b22a208886d20d34097d7f8bdc103cf89f8 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -143,8 +143,8 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p)
        return remote->url_nr;
 }
 
-static NORETURN int die_push_simple(struct branch *branch,
-                                   struct remote *remote)
+static NORETURN void die_push_simple(struct branch *branch,
+                                    struct remote *remote)
 {
        /*
         * There's no point in using shorten_unambiguous_ref here,
@@ -357,8 +357,10 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
 
        if (verbosity > 0)
                fprintf(stderr, _("Pushing to %s\n"), transport->url);
+       trace2_region_enter("push", "transport_push", the_repository);
        err = transport_push(the_repository, transport,
                             rs, flags, &reject_reasons);
+       trace2_region_leave("push", "transport_push", the_repository);
        if (err != 0) {
                fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));
                error(_("failed to push some refs to '%s'"), transport->url);