diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-20 15:20:42 -0700 |
| commit | 67fc02be54bc8f5e8abf381456f297e32440b88a (patch) | |
| tree | 8044c27a6429fdbddc466df039ac9eb9efc7de04 /builtin/index-pack.c | |
| parent | Merge branch 'tb/pack-finalize-ordering' (diff) | |
| parent | bundle: show progress on "unbundle" (diff) | |
| download | tgif-67fc02be54bc8f5e8abf381456f297e32440b88a.tar.xz | |
Merge branch 'ab/unbundle-progress'
Add progress display to "git bundle unbundle".
* ab/unbundle-progress:
bundle: show progress on "unbundle"
index-pack: add --progress-title option
bundle API: change "flags" to be "extra_index_pack_args"
bundle API: start writing API documentation
Diffstat (limited to 'builtin/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index f267dce49e..8b52bea84d 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -122,6 +122,7 @@ static int strict; static int do_fsck_object; static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES; static int verbose; +static const char *progress_title; static int show_resolving_progress; static int show_stat; static int check_self_contained_and_connected; @@ -1153,6 +1154,7 @@ static void parse_pack_objects(unsigned char *hash) if (verbose) progress = start_progress( + progress_title ? progress_title : from_stdin ? _("Receiving objects") : _("Indexing objects"), nr_objects); for (i = 0; i < nr_objects; i++) { @@ -1800,6 +1802,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) input_len = sizeof(*hdr); } else if (!strcmp(arg, "-v")) { verbose = 1; + } else if (!strcmp(arg, "--progress-title")) { + if (progress_title || (i+1) >= argc) + usage(index_pack_usage); + progress_title = argv[++i]; } else if (!strcmp(arg, "--show-resolving-progress")) { show_resolving_progress = 1; } else if (!strcmp(arg, "--report-end-of-input")) { |