Merge branch 'pw/rebase-abort-clean-rewritten'

diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 25d91163563614110d2c93802ce3fef6d5844325..018879737aeedc245a1473247df16ed0dcd26e50 100644 (file)
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -28,6 +28,8 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
        if (!enter_repo(argv[1], 0))
                die("'%s' does not appear to be a git repository", argv[1]);
 
+       init_archivers();
+
        /* put received options in sent_argv[] */
        argv_array_push(&sent_argv, "git-upload-archive");
        for (;;) {