summaryrefslogtreecommitdiff
path: root/builtin/verify-pack.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2020-07-29 23:14:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-30 16:16:48 (GMT)
commite74b606d47ff65de497b06ac6c8ace6761cceea1 (patch)
tree8baf06d35c6038dfd7ff717cdbc1941604170ceb /builtin/verify-pack.c
parent439d3a17b66d7e2f15fac72960a09261b72ac0d7 (diff)
downloadgit-e74b606d47ff65de497b06ac6c8ace6761cceea1.zip
git-e74b606d47ff65de497b06ac6c8ace6761cceea1.tar.gz
git-e74b606d47ff65de497b06ac6c8ace6761cceea1.tar.bz2
builtin/verify-pack: implement an --object-format option
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 <sandals@crustytoothpaste.net> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/verify-pack.c')
-rw-r--r--builtin/verify-pack.c23
1 files changed, 15 insertions, 8 deletions
diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c
index c2a1a5c..3669a90 100644
--- a/builtin/verify-pack.c
+++ b/builtin/verify-pack.c
@@ -7,21 +7,26 @@
#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 argv_array *argv = &index_pack.args;
struct strbuf 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)
+ argv_array_pushf(argv, "--object-format=%s", hash_algo);
/*
* In addition to "foo.pack" we accept "foo.idx" and "foo";
@@ -31,9 +36,8 @@ 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.git_cmd = 1;
err = run_command(&index_pack);
@@ -60,12 +64,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 +82,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;
}