From patchwork Sun Jul 26 19:54:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11686105 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 530181392 for ; Sun, 26 Jul 2020 19:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 398FA2065F for ; Sun, 26 Jul 2020 19:55:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="R38lF2FB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728114AbgGZTz2 (ORCPT ); Sun, 26 Jul 2020 15:55:28 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40796 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728098AbgGZTz0 (ORCPT ); Sun, 26 Jul 2020 15:55:26 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id AFA876101E; Sun, 26 Jul 2020 19:54:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1595793294; bh=6N4G4RGnbVOML4oWSVsxYv86pn8nZgTQMmb4MrJwl2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=R38lF2FBNgI1FE8bffpTkUmGLpWLb0T575HyrmAay5r57p0rZqNJIWe8PX3MeQoDv /GWVU7KmxN88IWzb/3zME1kZqQpYHrqF3FofbLabUcttDbTiJLRv68fDkHxOb5MHOB jGrr4/FYArzTlztZKls+JRxouL0YwwLDB+MNTMZwRTjvWDZIAFQ8hLUOv0/pJxKTFI 3Ia6MmkiqxiWbA3/ljJEBZGL/I4bnLyk+jvlVr6ig6g+Le1/Y7VNUNfKXbnr/ZXRwx RisY7zUfPn2VLajAoou16CFecSnIALVJKe+URGM/uiSBM4pKTPfAd6dTyZSkqquAf+ k9TbgUoKJDMkzGFqkoI/9zPjgWwWL4BgfoSRf1LINgRXU17hdyk0ixLuLBz9OEwBek A/O3+I/e8pDQix+4ag1UY4XXFzkvBS/tpftdgRrycBgg3fWRv1S/zoLtE3pJygIGFp v7Gv2frwMbB1DK07Hh5SW0mdBOvwbHeEXCeAKnnXpLmwWjaSTUd From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v4 30/39] builtin/verify-pack: implement an --object-format option Date: Sun, 26 Jul 2020 19:54:15 +0000 Message-Id: <20200726195424.626969-31-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.rc2.160.gd0b3904b262 In-Reply-To: <20200726195424.626969-1-sandals@crustytoothpaste.net> References: <20200726195424.626969-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org A recently added test in t5702 started using git verify-pack outside of a repository. While this poses no problems with SHA-1, with SHA-256 we implicitly rely on the setup of the repository to initialize our hash algorithm settings. Since we're not in a repository here, we need to provide git verify-pack help to set things up properly. git index-pack already knows an --object-format option, so let's accept one as well and pass it down to our git index-pack invocation. Since we're now dynamically adjusting the elements in argv, let's switch to using struct argv_array to manage them. Finally, let's make t5702 pass the proper argument on down to its git verify-pack caller. Signed-off-by: brian m. carlson --- builtin/verify-pack.c | 29 ++++++++++++++++++++--------- t/t5702-protocol-v2.sh | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c index c2a1a5c504..033e05d1a7 100644 --- a/builtin/verify-pack.c +++ b/builtin/verify-pack.c @@ -7,21 +7,28 @@ #define VERIFY_PACK_VERBOSE 01 #define VERIFY_PACK_STAT_ONLY 02 -static int verify_one_pack(const char *path, unsigned int flags) +static int verify_one_pack(const char *path, unsigned int flags, const char *hash_algo) { struct child_process index_pack = CHILD_PROCESS_INIT; - const char *argv[] = {"index-pack", NULL, NULL, NULL }; - struct strbuf arg = STRBUF_INIT; + struct argv_array argv = ARGV_ARRAY_INIT; + struct strbuf arg = STRBUF_INIT, hash_arg = STRBUF_INIT; int verbose = flags & VERIFY_PACK_VERBOSE; int stat_only = flags & VERIFY_PACK_STAT_ONLY; int err; + argv_array_push(&argv, "index-pack"); + if (stat_only) - argv[1] = "--verify-stat-only"; + argv_array_push(&argv, "--verify-stat-only"); else if (verbose) - argv[1] = "--verify-stat"; + argv_array_push(&argv, "--verify-stat"); else - argv[1] = "--verify"; + argv_array_push(&argv, "--verify"); + + if (hash_algo) { + strbuf_addf(&hash_arg, "--object-format=%s", hash_algo); + argv_array_push(&argv, hash_arg.buf); + } /* * In addition to "foo.pack" we accept "foo.idx" and "foo"; @@ -31,9 +38,9 @@ static int verify_one_pack(const char *path, unsigned int flags) if (strbuf_strip_suffix(&arg, ".idx") || !ends_with(arg.buf, ".pack")) strbuf_addstr(&arg, ".pack"); - argv[2] = arg.buf; + argv_array_push(&argv, arg.buf); - index_pack.argv = argv; + index_pack.argv = argv.argv; index_pack.git_cmd = 1; err = run_command(&index_pack); @@ -47,6 +54,7 @@ static int verify_one_pack(const char *path, unsigned int flags) } } strbuf_release(&arg); + argv_array_clear(&argv); return err; } @@ -60,12 +68,15 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix) { int err = 0; unsigned int flags = 0; + const char *object_format = NULL; int i; const struct option verify_pack_options[] = { OPT_BIT('v', "verbose", &flags, N_("verbose"), VERIFY_PACK_VERBOSE), OPT_BIT('s', "stat-only", &flags, N_("show statistics only"), VERIFY_PACK_STAT_ONLY), + OPT_STRING(0, "object-format", &object_format, N_("hash"), + N_("specify the hash algorithm to use")), OPT_END() }; @@ -75,7 +86,7 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix) if (argc < 1) usage_with_options(verify_pack_usage, verify_pack_options); for (i = 0; i < argc; i++) { - if (verify_one_pack(argv[i], flags)) + if (verify_one_pack(argv[i], flags, object_format)) err = 1; } diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh index 1b54c35b01..7fc22171e7 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -829,7 +829,7 @@ test_expect_success 'part of packfile response provided as URI' ' # Ensure that my-blob and other-blob are in separate packfiles. for idx in http_child/.git/objects/pack/*.idx do - git verify-pack --verbose $idx >out && + git verify-pack --object-format=$(test_oid algo) --verbose $idx >out && { grep "^[0-9a-f]\{16,\} " out || : } >out.objectlist &&