On Fri, 4 Dec 2009, Tay Ray Chuan wrote:
> Move the failed push message to before transport_disconnect() so that
> it doesn't access transport->url after transport has been free()'d (in
> transport_disconnect()).
>
> Additionally, make the failed push message more accurate by moving it
> before transport_disconnect(), so that it doesn't report errors due
> to a failed disconnect.
>
> Cc: "Daniel Barkalow" <barkalow@xxxxxxxxxxxx>
> Signed-off-by: Tay Ray Chuan <rctay89@xxxxxxxxx>
Acked-by: Daniel Barkalow <barkalow@xxxxxxxxxxxx>
> ---
> builtin-push.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/builtin-push.c b/builtin-push.c
> index a21e46c..dcfb53f 100644
> --- a/builtin-push.c
> +++ b/builtin-push.c
> @@ -101,13 +101,14 @@ static int push_with_options(struct transport *transport, int flags)
> fprintf(stderr, "Pushing to %s\n", transport->url);
> err = transport_push(transport, refspec_nr, refspec, flags,
> &nonfastforward);
> + if (err != 0)
> + error("failed to push some refs to '%s'", transport->url);
> +
> err |= transport_disconnect(transport);
>
> if (!err)
> return 0;
>
> - error("failed to push some refs to '%s'", transport->url);
> -
> if (nonfastforward && advice_push_nonfastforward) {
> printf("To prevent you from losing history, non-fast-forward updates were rejected\n"
> "Merge the remote changes before pushing again. See the 'non-fast-forward'\n"
> --
> 1.6.6.rc1.249.g048b3
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html