[PATCH v6 07/10] transport-helper: add support for old:new refspec

2013-11-11 Thread Felipe Contreras
By using fast-export's new --refspec option.

Signed-off-by: Felipe Contreras 
---
 t/t5801-remote-helpers.sh |  2 +-
 transport-helper.c| 13 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index c33cc25..454337e 100755
--- 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
 '
 
-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
) &&
diff --git a/transport-helper.c b/transport-helper.c
index 9a5814d..7411125 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -850,7 +850,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)
@@ -888,8 +888,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);
}
}
@@ -897,6 +902,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);
-- 
1.8.4.2+fc1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v6 07/10] transport-helper: add support for old:new refspec

2013-11-12 Thread Felipe Contreras
By using fast-export's new --refspec option.

Signed-off-by: Felipe Contreras 
---
 t/t5801-remote-helpers.sh |  2 +-
 transport-helper.c| 13 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index c33cc25..454337e 100755
--- 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
 '
 
-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
) &&
diff --git a/transport-helper.c b/transport-helper.c
index 23af747..2da4259 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -850,7 +850,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)
@@ -888,8 +888,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);
}
}
@@ -897,6 +902,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);
-- 
1.8.4.2+fc1

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html