Re: [PATCH v5 01/10] transport-helper: fix extra lines

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 31, 2013, 18:16 UTC
Message-ID: <xmqqeh7171bv.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1383212197-14259-3-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 7 quoted lines

> Commit 9c51558 (transport-helper: trivial code shuffle) moved these
> lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
> had a wrong merge conflict and readded them.
>
> Reported-by: Richard Hansen <rhansen@bbn.com>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---

Ahh, sorry about that.  Will apply with a retitle.

Show 17 quoted lines

>  transport-helper.c | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/transport-helper.c b/transport-helper.c
> index b32e2d6..985eeea 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -874,9 +874,6 @@ static int push_refs_with_export(struct transport *transport,
>  		}
>  		free(private);
>  
> -		if (ref->deletion)
> -			die("remote-helpers do not support ref deletion");
> -
>  		if (ref->peer_ref) {
>  			if (strcmp(ref->peer_ref->name, ref->name))
>  				die("remote-helpers do not support old:new syntax");