{"thread":{"id":"31846","subject":"[PATCH] transport-helper: call git fast-import properly","startedAt":"2012-10-17T08:27:20Z","lastAt":"2012-10-18T07:39:35Z","messageCount":3,"participants":["Felipe Contreras","Sverre Rabbelier"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"201414","messageId":"1350462440-427-1-git-send-email-felipe.contreras@gmail.com","threadId":"31846","inReplyTo":null,"subject":"[PATCH] transport-helper: call git fast-import properly","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-10-17T08:27:20Z","receivedAt":"2012-10-17T08:27:20Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"The marks options are being ignored right now.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n transport-helper.c | 11 +++++++++--\n 1 file changed, 9 insertions(+), 2 deletions(-)\n\ndiff --git a/transport-helper.c b/transport-helper.c\nindex cfe0988..29bde0a 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -375,12 +375,19 @@ static int fetch_with_fetch(struct transport *transport,\n \n static int get_importer(struct transport *transport, struct child_process *fastimport)\n {\n+\tstruct helper_data *data = transport->data;\n \tstruct child_process *helper = get_helper(transport);\n+\tint argc = 0;\n+\n \tmemset(fastimport, 0, sizeof(*fastimport));\n \tfastimport->in = helper->out;\n \tfastimport->argv = xcalloc(5, sizeof(*fastimport->argv));\n-\tfastimport->argv[0] = \"fast-import\";\n-\tfastimport->argv[1] = \"--quiet\";\n+\tfastimport->argv[argc++] = \"fast-import\";\n+\tfastimport->argv[argc++] = \"--quiet\";\n+\tif (data->export_marks)\n+\t\tfastimport->argv[argc++] = data->export_marks;\n+\tif (data->import_marks)\n+\t\tfastimport->argv[argc++] = data->import_marks;\n \n \tfastimport->git_cmd = 1;\n \treturn start_command(fastimport);\n-- \n1.8.0.rc2.5.gccf4c94\n"},{"id":"201464","messageId":"CAGdFq_jNs_CNN8PGbbgvJbmNTSSN9TaEDxCSyDEpScZL4zyiwg@mail.gmail.com","threadId":"31846","inReplyTo":"1350462440-427-1-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH] transport-helper: call git fast-import properly","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2012-10-18T05:13:16Z","receivedAt":"2012-10-18T05:13:16Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"On Wed, Oct 17, 2012 at 1:27 AM, Felipe Contreras\n<felipe.contreras@gmail.com> wrote:\n> The marks options are being ignored right now.\n\nIt seems unlikely to me that this never worked, surely no reviewer\nwould accept a patch that doesn't actually implement the feature?\nWhat's the history here?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"201481","messageId":"CAMP44s3FsdF7944TkO3CVCV9d80TTocE5zXyE8sh1bXL0eMu5Q@mail.gmail.com","threadId":"31846","inReplyTo":"CAGdFq_jNs_CNN8PGbbgvJbmNTSSN9TaEDxCSyDEpScZL4zyiwg@mail.gmail.com","subject":"Re: [PATCH] transport-helper: call git fast-import properly","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-10-18T07:39:35Z","receivedAt":"2012-10-18T07:39:35Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Thu, Oct 18, 2012 at 7:13 AM, Sverre Rabbelier <srabbelier@gmail.com> wrote:\n> On Wed, Oct 17, 2012 at 1:27 AM, Felipe Contreras\n> <felipe.contreras@gmail.com> wrote:\n>> The marks options are being ignored right now.\n>\n> It seems unlikely to me that this never worked, surely no reviewer\n> would accept a patch that doesn't actually implement the feature?\n> What's the history here?\n\nNow I see, the {import,export}-marks options are only meant for\nfast-export, for fast-import one should use the 'feature' commands. It\ntook me a while because the git_remote_helper code for python is very\nconfusing: it uses testgit.marks for the marks that git generates, and\ngit.marks for the marks that testgit generates.\n\nIt's not very convenient for remote-helpers that can export single\nbranches as opposed to the whole repo:\n\nhttp://github.com/felipec/git/commit/0961fdf8231a4ac057eec8a306a708e66f7b6ae9\n\nBut it works, so this patch is not needed.\n\n-- \nFelipe Contreras\n"}]}