Richard Hansen wrote: > On 2013-08-29 11:23, Felipe Contreras wrote: > > For remote-helpers that use 'export' to push. > > > > Signed-off-by: Felipe Contreras <[email protected]> > > --- > > t/t5801-remote-helpers.sh | 8 ++++++++ > > transport-helper.c | 11 ++++++----- > > 2 files changed, 14 insertions(+), 5 deletions(-) > > > [...] > > diff --git a/transport-helper.c b/transport-helper.c > > index c7135ef..5490796 100644 > > --- a/transport-helper.c > > +++ b/transport-helper.c > > @@ -844,18 +844,19 @@ static int push_refs_with_export(struct transport > > *transport, > > } > > free(private); > > > > - if (ref->deletion) > > - die("remote-helpers do not support ref deletion"); > > - > > The above deleted lines actually appear twice in transport-helper.c due > to an incorrect merge conflict resolution in > 99d9ec090677c925c534001f01cbaf303a31cb82. The other copy of those lines > should > also be deleted: > > diff --git a/transport-helper.c b/transport-helper.c > index 859131f..bbf4e7c 100644 > --- a/transport-helper.c > +++ b/transport-helper.c > @@ -874,9 +874,6 @@ static int push_refs_with_export(struct transport > *transport, > char *private; > unsigned char sha1[20]; > > - if (ref->deletion) > - die("remote-helpers do not support ref deletion"); > - > private = apply_refspecs(data->refspecs, data->refspec_nr, > ref->name); > if (private && !get_sha1(private, sha1)) { > strbuf_addf(&buf, "^%s", private);
Right. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
