]> git.ipfire.org Git - thirdparty/git.git/commitdiff
midx: honor the MIDX_PROGRESS flag in midx_repack
authorWilliam Baker <William.Baker@microsoft.com>
Mon, 21 Oct 2019 18:40:02 +0000 (18:40 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2019 03:05:06 +0000 (12:05 +0900)
Update midx_repack to only display progress when
the MIDX_PROGRESS flag is set.

Signed-off-by: William Baker <William.Baker@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
midx.c

diff --git a/midx.c b/midx.c
index 1b22b2144e249248daec6541a4471fc27a3e5345..37ec28623af67f01ec6fbc2f42c6e727eddbdaf4 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -1373,6 +1373,12 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size,
        strbuf_addstr(&base_name, object_dir);
        strbuf_addstr(&base_name, "/pack/pack");
        argv_array_push(&cmd.args, base_name.buf);
+
+       if (flags & MIDX_PROGRESS)
+               argv_array_push(&cmd.args, "--progress");
+       else
+               argv_array_push(&cmd.args, "-q");
+
        strbuf_release(&base_name);
 
        cmd.git_cmd = 1;