From d98c81538015630603fd20f6e08e960555a38c52 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 20 Apr 2014 13:59:25 -0500 Subject: transport-helper: add support for old:new refspec By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'transport-helper.c') diff --git a/transport-helper.c b/transport-helper.c index 86e1679c1e..3f45c478fa 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -856,7 +856,7 @@ static int push_refs_with_export(struct transport *transport, struct ref *ref; struct child_process *helper, exporter; struct helper_data *data = transport->data; - struct string_list revlist_args = STRING_LIST_INIT_NODUP; + struct string_list revlist_args = STRING_LIST_INIT_DUP; struct strbuf buf = STRBUF_INIT; if (!data->refspecs) @@ -894,8 +894,13 @@ static int push_refs_with_export(struct transport *transport, free(private); if (ref->peer_ref) { - if (strcmp(ref->peer_ref->name, ref->name)) - die("remote-helpers do not support old:new syntax"); + if (strcmp(ref->name, ref->peer_ref->name)) { + struct strbuf buf = STRBUF_INIT; + strbuf_addf(&buf, "%s:%s", ref->peer_ref->name, ref->name); + string_list_append(&revlist_args, "--refspec"); + string_list_append(&revlist_args, buf.buf); + strbuf_release(&buf); + } string_list_append(&revlist_args, ref->peer_ref->name); } } @@ -903,6 +908,8 @@ static int push_refs_with_export(struct transport *transport, if (get_exporter(transport, &exporter, &revlist_args)) die("Couldn't run fast-export"); + string_list_clear(&revlist_args, 1); + if (finish_command(&exporter)) die("Error while running fast-export"); push_update_refs_status(data, remote_refs, flags); -- cgit v1.2.3 From 9193f742350d1b97e32b0687d1577dc2b2a0d713 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 20 Apr 2014 13:59:26 -0500 Subject: transport-helper: add support to push symbolic refs For example 'HEAD'. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'transport-helper.c') diff --git a/transport-helper.c b/transport-helper.c index 3f45c478fa..f74eb57046 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -896,7 +896,16 @@ static int push_refs_with_export(struct transport *transport, if (ref->peer_ref) { if (strcmp(ref->name, ref->peer_ref->name)) { struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s:%s", ref->peer_ref->name, ref->name); + const char *name; + int flag; + + /* Follow symbolic refs (mainly for HEAD). */ + name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag); + if (!name || !(flag & REF_ISSYMREF)) + name = ref->peer_ref->name; + + strbuf_addf(&buf, "%s:%s", name, ref->name); + string_list_append(&revlist_args, "--refspec"); string_list_append(&revlist_args, buf.buf); strbuf_release(&buf); -- cgit v1.2.3 From f3d0376356756c55a85a3d745858a42c26956e74 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 20 Apr 2014 13:59:29 -0500 Subject: transport-helper: add support to delete branches For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'transport-helper.c') diff --git a/transport-helper.c b/transport-helper.c index f74eb57046..36fbf9349e 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -882,9 +882,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); @@ -896,21 +893,26 @@ static int push_refs_with_export(struct transport *transport, if (ref->peer_ref) { if (strcmp(ref->name, ref->peer_ref->name)) { struct strbuf buf = STRBUF_INIT; - const char *name; - int flag; - /* Follow symbolic refs (mainly for HEAD). */ - name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag); - if (!name || !(flag & REF_ISSYMREF)) - name = ref->peer_ref->name; + if (!ref->deletion) { + const char *name; + int flag; + + /* Follow symbolic refs (mainly for HEAD). */ + name = resolve_ref_unsafe(ref->peer_ref->name, sha1, 1, &flag); + if (!name || !(flag & REF_ISSYMREF)) + name = ref->peer_ref->name; - strbuf_addf(&buf, "%s:%s", name, ref->name); + strbuf_addf(&buf, "%s:%s", name, ref->name); + } else + strbuf_addf(&buf, ":%s", ref->name); string_list_append(&revlist_args, "--refspec"); string_list_append(&revlist_args, buf.buf); strbuf_release(&buf); } - string_list_append(&revlist_args, ref->peer_ref->name); + if (!ref->deletion) + string_list_append(&revlist_args, ref->peer_ref->name); } } -- cgit v1.2.3 From e143ef4f6b08e0f948180f28ad3ba77c9a2e0a61 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 20 Apr 2014 13:59:30 -0500 Subject: transport-helper: remove unnecessary strbuf resets Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'transport-helper.c') diff --git a/transport-helper.c b/transport-helper.c index 36fbf9349e..a90094d4a3 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -876,8 +876,6 @@ static int push_refs_with_export(struct transport *transport, write_constant(helper->in, "export\n"); - strbuf_reset(&buf); - for (ref = remote_refs; ref; ref = ref->next) { char *private; unsigned char sha1[20]; @@ -892,8 +890,6 @@ static int push_refs_with_export(struct transport *transport, if (ref->peer_ref) { if (strcmp(ref->name, ref->peer_ref->name)) { - struct strbuf buf = STRBUF_INIT; - if (!ref->deletion) { const char *name; int flag; -- cgit v1.2.3