threads / patch / 31846

patchtransport-helper: call git fast-import properly

Subject: [PATCH] transport-helper: call git fast-import properly

## tl;dr

3 messages between Oct 17, 2012 and Oct 18, 2012. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Felipe Contreras· Oct 17, 2012, 08:27 UTC · lore

The marks options are being ignored right now.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 transport-helper.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Show changes to transport-helper.c +9 −2

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

Sverre Rabbelier· Oct 18, 2012, 05:13 UTC · re: Felipe Contreras · lore

Re: [PATCH] transport-helper: call git fast-import properly

On Wed, Oct 17, 2012 at 1:27 AM, Felipe Contreras <felipe.contreras@gmail.com> wrote:

> The marks options are being ignored right now.

It seems unlikely to me that this never worked, surely no reviewer would accept a patch that doesn't actually implement the feature? What's the history here?

-- 
Cheers,

Sverre Rabbelier

Felipe Contreras· Oct 18, 2012, 07:39 UTC · re: Sverre Rabbelier · lore

Re: [PATCH] transport-helper: call git fast-import properly

On Thu, Oct 18, 2012 at 7:13 AM, Sverre Rabbelier <srabbelier@gmail.com> wrote:

Show 7 quoted lines

> On Wed, Oct 17, 2012 at 1:27 AM, Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
>> The marks options are being ignored right now.
>
> It seems unlikely to me that this never worked, surely no reviewer
> would accept a patch that doesn't actually implement the feature?
> What's the history here?

Now I see, the {import,export}-marks options are only meant for fast-export, for fast-import one should use the 'feature' commands. It took me a while because the git_remote_helper code for python is very confusing: it uses testgit.marks for the marks that git generates, and git.marks for the marks that testgit generates.

It's not very convenient for remote-helpers that can export single branches as opposed to the whole repo:

http://github.com/felipec/git/commit/0961fdf8231a4ac057eec8a306a708e66f7b6ae9

But it works, so this patch is not needed.

-- 
Felipe Contreras