From patchwork Tue Oct 23 00:20:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 10652635 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7099713A4 for ; Tue, 23 Oct 2018 00:20:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7FC928FA8 for ; Tue, 23 Oct 2018 00:20:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5E2E28FDD; Tue, 23 Oct 2018 00:20:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 294C328EEF for ; Tue, 23 Oct 2018 00:20:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726606AbeJWIlF (ORCPT ); Tue, 23 Oct 2018 04:41:05 -0400 Received: from mail-pl1-f201.google.com ([209.85.214.201]:40960 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726286AbeJWIlF (ORCPT ); Tue, 23 Oct 2018 04:41:05 -0400 Received: by mail-pl1-f201.google.com with SMTP id j1-v6so4230376pll.8 for ; Mon, 22 Oct 2018 17:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=CNsV3iSQR+Wd1aZsLOqHJ9DOIExK//RMlGflMjZ7YsU=; b=siPQUKf/xbVXsXPgEOIrjuP3/vxg3OYPjG/KyZwZCE1P+91RpuL/9bBjGHevSP2jTX 6Q5XElXgmo7H/a/qqnwdfGmuNnI4gneCLUju+fjUmhEY3AR3FKBfaY9Lb3KQ9UmCODnf KbnXrS37mUZf4y2T3SkHFFZ01zaLcg6wa/MP14ttmHaPMb4ked7QBmq7EhOIlq6lDu7T zTHSW0vNOaHZudu5RIlyqC7ZcSYRKZ8w4GwtjkXLBrwGtdiCgWOxqaUeRQLGXvROwpJT 4BJnj7DsMa2UCwa6/dDtRNTmPLkai6nUuzn8vBwbyuh5t6kXmmvlmSk/7RuH04oVfZOE eX2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=CNsV3iSQR+Wd1aZsLOqHJ9DOIExK//RMlGflMjZ7YsU=; b=Nkvxnah5wJk0CaeMhqMrZ9vTpZ4Xoj4mKjFHQRPhjMTKc969aRdu88Oh4aApVEuq9h HEamlwt8/aXiEmMoMEVbXMbLmyLUNB3b7UDDgevKVd0Vx0LOR8aAE2TxE9yCfjnlyfKK 313fkLQylzEDmPQlV8eiXgD1i9jrc7TGcNEa37VZ6/GN3xNgIFMLasfLyy3blkiZKDtR nBGCaKEls4PFoDnusvx3gilWvk8rnKGPW0pFTd7CHgex9BozhZ9dT4YD29jrzHEg1OAO 82pPCqnqwGphL90o0eIw4q14bQZ/LwQK3f2G98uymI8/VvNX/IOWWQ6QP0U4ueS4Agy8 Da4Q== X-Gm-Message-State: ABuFfogWD+fCAvoPnjlhwKuExGfbcQRqdC7QcRuoF+U4gkmfG6J79chP qlLr6QbjQp1nEKyIEsWdK/cJq1GCQFXHUq0Wuqn3j+pvXmtbKaBIWglwYDfFngJN5msTrlbCKAn YCbWIkKwc9MT2UypOD7+ZmCKEKxFqApAsr0ZfRLU/t/TA3pIEMp8GQOiyJ44QCYE= X-Google-Smtp-Source: ACcGV60CtLjFFAwsS4Pje+BRKd7lu2RLOJeqx/Pm05w+xDZ6EEe869Qf8Doczh45oJeozh8eUqGH9Jkidn5png== X-Received: by 2002:a62:3a9a:: with SMTP id v26-v6mr24637288pfj.34.1540254016673; Mon, 22 Oct 2018 17:20:16 -0700 (PDT) Date: Mon, 22 Oct 2018 17:20:14 -0700 In-Reply-To: <39a4e7bf8f3ebc5803393f357d1ee7dc9806252f.1540251936.git.steadmon@google.com> Message-Id: <1d7b07092872e4735dbdedfbfdd86a1c9e71290a.1540253913.git.steadmon@google.com> Mime-Version: 1.0 References: <39a4e7bf8f3ebc5803393f357d1ee7dc9806252f.1540251936.git.steadmon@google.com> X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [PATCH v4] archive: initialize archivers earlier From: steadmon@google.com To: git@vger.kernel.org Cc: peff@peff.net, gitster@pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Initialize archivers as soon as possible when running git-archive. Various non-obvious behavior depends on having the archivers initialized, such as determining the desired archival format from the provided filename. Since 08716b3c11 ("archive: refactor file extension format-guessing", 2011-06-21), archive_format_from_filename() has used the registered archivers to match filenames (provided via --output) to archival formats. However, when git-archive is executed with --remote, format detection happens before the archivers have been registered. This causes archives from remotes to always be generated as TAR files, regardless of the actual filename (unless an explicit --format is provided). This patch fixes that behavior; archival format is determined properly from the output filename, even when --remote is used. Signed-off-by: Josh Steadmon Helped-by: Jeff King --- Range-diff against v3: 1: 39a4e7bf8f ! 1: 1d7b070928 archive: initialize archivers earlier @@ -91,15 +91,6 @@ --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ - - test_lazy_prereq GZIP 'gzip --version' - -+test_lazy_prereq ZIP 'zip --version' -+ - get_pax_header() { - file=$1 - header=$2= -@@ test_cmp_bin b.tar d4.zip ' @@ -108,14 +99,29 @@ + gzip -d -c < d5.tgz > d5.tar && + test_cmp_bin b.tar d5.tar +' -+ -+test_expect_success ZIP 'git archive with --output and --remote creates .zip' ' -+ git archive --output=d6.zip --remote=. HEAD && -+ zip -sf d6.zip | sed "/^[^ ]/d" | sed "s/^ //" | sort > zip_manifest && -+ "$TAR" tf b.tar | sort > tar_manifest && -+ test_cmp zip_manifest tar_manifest -+' + test_expect_success 'git archive --list outside of a git repo' ' nongit git archive --list ' + + diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh + --- a/t/t5003-archive-zip.sh + +++ b/t/t5003-archive-zip.sh +@@ + 'git archive --format=zip --output=d2.zip HEAD && + test_cmp_bin d.zip d2.zip' + +-test_expect_success 'git archive with --output, inferring format' ' ++test_expect_success 'git archive with --output, inferring format (local)' ' + git archive --output=d3.zip HEAD && + test_cmp_bin d.zip d3.zip + ' + ++test_expect_success 'git archive with --output, inferring format (remote)' ' ++ git archive --remote=. --output=d4.zip HEAD && ++ test_cmp_bin d.zip d4.zip ++' ++ + test_expect_success \ + 'git archive --format=zip with prefix' \ + 'git archive --format=zip --prefix=prefix/ HEAD >e.zip' archive.c | 9 ++++++--- archive.h | 1 + builtin/archive.c | 2 ++ builtin/upload-archive.c | 2 ++ t/t5000-tar-tree.sh | 6 ++++++ t/t5003-archive-zip.sh | 7 ++++++- 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/archive.c b/archive.c index c1870105eb..ce0f8a0362 100644 --- a/archive.c +++ b/archive.c @@ -29,6 +29,12 @@ void register_archiver(struct archiver *ar) archivers[nr_archivers++] = ar; } +void init_archivers(void) +{ + init_tar_archiver(); + init_zip_archiver(); +} + static void format_subst(const struct commit *commit, const char *src, size_t len, struct strbuf *buf) @@ -531,9 +537,6 @@ int write_archive(int argc, const char **argv, const char *prefix, git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable); git_config(git_default_config, NULL); - init_tar_archiver(); - init_zip_archiver(); - args.repo = repo; argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote); if (!startup_info->have_repository) { diff --git a/archive.h b/archive.h index d4f97a00f5..21ac010699 100644 --- a/archive.h +++ b/archive.h @@ -43,6 +43,7 @@ extern void register_archiver(struct archiver *); extern void init_tar_archiver(void); extern void init_zip_archiver(void); +extern void init_archivers(void); typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, const struct object_id *oid, diff --git a/builtin/archive.c b/builtin/archive.c index e74f675390..d2455237ce 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -97,6 +97,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, local_opts, NULL, PARSE_OPT_KEEP_ALL); + init_archivers(); + if (output) create_output_file(output); diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index 25d9116356..018879737a 100644 --- 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 (;;) { diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 2a97b27b0a..e2ee920b06 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -206,6 +206,12 @@ test_expect_success 'git archive with --output, override inferred format' ' test_cmp_bin b.tar d4.zip ' +test_expect_success GZIP 'git archive with --output and --remote creates .tgz' ' + git archive --output=d5.tgz --remote=. HEAD && + gzip -d -c < d5.tgz > d5.tar && + test_cmp_bin b.tar d5.tar +' + test_expect_success 'git archive --list outside of a git repo' ' nongit git archive --list ' diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 55c7870997..106eddbd85 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -158,11 +158,16 @@ test_expect_success 'git archive --format=zip with --output' \ 'git archive --format=zip --output=d2.zip HEAD && test_cmp_bin d.zip d2.zip' -test_expect_success 'git archive with --output, inferring format' ' +test_expect_success 'git archive with --output, inferring format (local)' ' git archive --output=d3.zip HEAD && test_cmp_bin d.zip d3.zip ' +test_expect_success 'git archive with --output, inferring format (remote)' ' + git archive --remote=. --output=d4.zip HEAD && + test_cmp_bin d.zip d4.zip +' + test_expect_success \ 'git archive --format=zip with prefix' \ 'git archive --format=zip --prefix=prefix/ HEAD >e.zip'