summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:11 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 19:28:11 +0900
commitec08c4fd951b9ea5136aaecbaec834ffb665da80 (patch)
tree84547a0f57001f53d2f874df4d8980d02a1a9b5f /builtin
parentMerge branch 'bb/unicode-12' (diff)
parentmidx: during verify group objects by packfile to speed verification (diff)
downloadtgif-ec08c4fd951b9ea5136aaecbaec834ffb665da80.tar.xz
Merge branch 'jh/midx-verify-too-many-packs'
"git multi-pack-index verify" did not scale well with the number of packfiles, which is being improved. * jh/midx-verify-too-many-packs: midx: during verify group objects by packfile to speed verification midx: add progress indicators in multi-pack-index verify trace2:data: add trace2 data to midx progress: add sparse mode to force 100% complete message
Diffstat (limited to 'builtin')
-rw-r--r--builtin/multi-pack-index.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index fca70f8e4f..ae6e476ad5 100644
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -3,6 +3,7 @@
#include "config.h"
#include "parse-options.h"
#include "midx.h"
+#include "trace2.h"
static char const * const builtin_multi_pack_index_usage[] = {
N_("git multi-pack-index [--object-dir=<dir>] (write|verify)"),
@@ -40,6 +41,8 @@ int cmd_multi_pack_index(int argc, const char **argv,
return 1;
}
+ trace2_cmd_mode(argv[0]);
+
if (!strcmp(argv[0], "write"))
return write_midx_file(opts.object_dir);
if (!strcmp(argv[0], "verify"))