The marks options are being ignored right now.
Signed-off-by: Felipe Contreras <[email protected]>
---
transport-helper.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index cfe0988..29bde0a 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -375,12 +375,19 @@ static int fetch_with_fetch(struct transport *transport,
static int get_importer(struct transport *transport, struct child_process
*fastimport)
{
+ struct helper_data *data = transport->data;
struct child_process *helper = get_helper(transport);
+ int argc = 0;
+
memset(fastimport, 0, sizeof(*fastimport));
fastimport->in = helper->out;
fastimport->argv = xcalloc(5, sizeof(*fastimport->argv));
- fastimport->argv[0] = "fast-import";
- fastimport->argv[1] = "--quiet";
+ fastimport->argv[argc++] = "fast-import";
+ fastimport->argv[argc++] = "--quiet";
+ if (data->export_marks)
+ fastimport->argv[argc++] = data->export_marks;
+ if (data->import_marks)
+ fastimport->argv[argc++] = data->import_marks;
fastimport->git_cmd = 1;
return start_command(fastimport);
--
1.8.0.rc2.5.gccf4c94
--
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
