transport-helper: add support for old:new refspec

By using fast-export's new --refspec option.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 25fd2e7f46cb559372125e08671445476cbf6022..52b3c99478a278235da178740da123e895fd5d8b 100755 (executable)
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -87,7 +87,7 @@ test_expect_success 'push new branch by name' '
        compare_refs local HEAD server refs/heads/new-name
 '
 
        compare_refs local HEAD server refs/heads/new-name
 '
 

-test_expect_failure 'push new branch with old:new refspec' '
+test_expect_success 'push new branch with old:new refspec' '

        (cd local &&
         git push origin new-name:new-refspec
        ) &&
        (cd local &&
         git push origin new-name:new-refspec
        ) &&

diff --git a/transport-helper.c b/transport-helper.c
index 86e1679c1e0e1e58ebe5297f4c5f48ca1a1f6418..3f45c478fa8a77e1355405214f3722d43ad8d766 100644 (file)
--- 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 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)
        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) {
                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);
                }
        }
                        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");
 
        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);
        if (finish_command(&exporter))
                die("Error while running fast-export");
        push_update_refs_status(data, remote_refs, flags);