diff options
| -rw-r--r-- | git-remote-testgit.py | 2 | ||||
| -rw-r--r-- | transport-helper.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/git-remote-testgit.py b/git-remote-testgit.py index cdbc49495f..af4d040353 100644 --- a/git-remote-testgit.py +++ b/git-remote-testgit.py @@ -123,6 +123,8 @@ def do_import(repo, args): repo = update_local_repo(repo) repo.exporter.export_repo(repo.gitdir, args) + print "done" + def do_export(repo, args): """Imports a fast-import stream from git to testgit. diff --git a/transport-helper.c b/transport-helper.c index e02f4a3e5a..4c0d86113c 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -380,8 +380,9 @@ static int get_exporter(struct transport *transport, /* we need to duplicate helper->in because we want to use it after * fastexport is done with it. */ fastexport->out = dup(helper->in); - fastexport->argv = xcalloc(4 + revlist_args->nr, sizeof(*fastexport->argv)); + fastexport->argv = xcalloc(5 + revlist_args->nr, sizeof(*fastexport->argv)); fastexport->argv[argc++] = "fast-export"; + fastexport->argv[argc++] = "--use-done-feature"; if (export_marks) fastexport->argv[argc++] = export_marks; if (import_marks) @@ -417,11 +418,8 @@ static int fetch_with_import(struct transport *transport, sendline(data, &buf); strbuf_reset(&buf); } - if (disconnect_helper(transport)) - die("Error while disconnecting helper"); if (finish_command(&fastimport)) die("Error while running fast-import"); - free(fastimport.argv); fastimport.argv = NULL; @@ -764,11 +762,8 @@ static int push_refs_with_export(struct transport *transport, export_marks, import_marks, &revlist_args)) die("Couldn't run fast-export"); - data->no_disconnect_req = 1; if (finish_command(&exporter)) die("Error while running fast-export"); - if (disconnect_helper(transport)) - die("Error while disconnecting helper"); return 0; } |