From: Junio C Hamano <gitster@pobox•com>
To: Felipe Contreras <felipe.contreras@gmail•com>
Cc: git@vger•kernel.org, Sverre Rabbelier <srabbelier@gmail•com>,
Richard Hansen <rhansen@bbn•com>
Subject: Re: [PATCH v5 01/10] transport-helper: fix extra lines
Date: Thu, 31 Oct 2013 11:16:36 -0700 [thread overview]
Message-ID: <xmqqeh7171bv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1383212197-14259-3-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Thu, 31 Oct 2013 03:36:29 -0600")
Felipe Contreras <felipe.contreras@gmail•com> writes:
> 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.
> 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");
next prev parent reply other threads:[~2013-10-31 18:16 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-31 9:36 [PATCH v5 10/10] transport-helper: add support to delete branches Felipe Contreras
2013-10-31 9:36 ` [PATCH v5 00/10] transport-helper: updates Felipe Contreras
2013-10-31 17:59 ` Max Horn
2013-10-31 18:10 ` Junio C Hamano
2013-10-31 18:30 ` Felipe Contreras
2013-10-31 18:34 ` Junio C Hamano
2013-10-31 18:41 ` Max Horn
2013-11-11 5:09 ` [PATCH v5 11/10] test-hg.sh: tests are now expected to pass Richard Hansen
2013-11-11 5:10 ` [PATCH v5 12/10] remote-bzr: support the new 'force' option Richard Hansen
2013-11-11 11:51 ` Felipe Contreras
2013-11-11 18:12 ` Richard Hansen
2013-11-11 18:15 ` Felipe Contreras
2013-10-31 9:36 ` [PATCH v5 01/10] transport-helper: fix extra lines Felipe Contreras
2013-10-31 18:16 ` Junio C Hamano [this message]
2013-10-31 9:36 ` [PATCH v5 08/10] fast-import: add support to delete refs Felipe Contreras
2013-10-31 18:41 ` Max Horn
2013-10-31 9:36 ` [PATCH v5 05/10] fast-export: improve argument parsing Felipe Contreras
2013-10-31 9:36 ` [PATCH v5 06/10] fast-export: add new --refspec option Felipe Contreras
2013-10-31 18:26 ` Junio C Hamano
2013-10-31 18:41 ` Felipe Contreras
2013-11-06 21:00 ` Junio C Hamano
2013-11-06 22:14 ` Jeff King
2013-11-06 22:31 ` Junio C Hamano
2013-11-06 22:41 ` Junio C Hamano
2013-11-08 23:44 ` Junio C Hamano
2013-11-09 0:06 ` Jeff King
2013-11-07 1:00 ` Felipe Contreras
2013-10-31 9:36 ` [PATCH v5 03/10] transport-helper: add 'force' to 'export' helpers Felipe Contreras
2013-10-31 18:21 ` Junio C Hamano
2013-10-31 18:55 ` Felipe Contreras
2013-10-31 19:07 ` Junio C Hamano
2013-11-01 14:49 ` Junio C Hamano
2013-11-01 15:37 ` Felipe Contreras
2013-11-01 16:35 ` Junio C Hamano
2013-11-01 17:28 ` Eric Sunshine
2013-11-11 5:01 ` [PATCH] fixup! " Richard Hansen
2013-10-31 9:36 ` [PATCH v5 09/10] fast-export: add support to delete refs Felipe Contreras
2013-10-31 19:29 ` Max Horn
2013-10-31 19:41 ` Felipe Contreras
2013-10-31 19:47 ` Max Horn
2013-10-31 19:53 ` Felipe Contreras
2013-10-31 22:38 ` Max Horn
2013-10-31 9:36 ` [PATCH v5 07/10] transport-helper: add support for old:new refspec Felipe Contreras
2013-10-31 9:36 ` [PATCH v5 04/10] transport-helper: check for 'forced update' message Felipe Contreras
2013-10-31 9:36 ` [PATCH v5 02/10] transport-helper: don't update refs in dry-run Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqeh7171bv.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=felipe.contreras@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=rhansen@bbn$(echo .)com \
--cc=srabbelier@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox