repack: make '--quiet' disable progress

While testing some ideas in 'git repack', I ran it with '--quiet' and
discovered that some progress output was still shown. Specifically, the
output for writing the multi-pack-index showed the progress.

The 'show_progress' variable in cmd_repack() is initialized with
isatty(2) and is not modified at all by the '--quiet' flag. The
'--quiet' flag modifies the po_args.quiet option which is translated
into a '--quiet' flag for the 'git pack-objects' child process. However,
'show_progress' is used to directly send progress information to the
multi-pack-index writing logic which does not use a child process.

The fix here is to modify 'show_progress' to be false if po_opts.quiet
is true, and isatty(2) otherwise. This new expectation simplifies a
later condition that checks both.

Update the documentation to make it clear that '-q' will disable all
progress in addition to ensuring the 'git pack-objects' child process
will receive the flag.

Use 'test_terminal' to check that this works to get around the isatty(2)
check.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 7183fb498f4ccec69e6bd75dcef44f54974a159b..ee30edc178a4d418610612215935452b6daca567 100644 (file)
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -76,8 +76,9 @@ to the new separate pack will be written.
        linkgit:git-pack-objects[1].
 
 -q::
-       Pass the `-q` option to 'git pack-objects'. See
-       linkgit:git-pack-objects[1].
+--quiet::
+       Show no progress over the standard error stream and pass the `-q`
+       option to 'git pack-objects'. See linkgit:git-pack-objects[1].
 
 -n::
        Do not update the server information with

diff --git a/builtin/repack.c b/builtin/repack.c
index 3c0346fab526b399763a72a778db5a27cb9e031d..b41adb8f3ec5901d8d7b1c08228a6166cddff7e4 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -610,7 +610,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
        struct tempfile *refs_snapshot = NULL;
        int i, ext, ret;
        FILE *out;
-       int show_progress = isatty(2);
+       int show_progress;
 
        /* variables to be filled by option parsing */
        int pack_everything = 0;
@@ -723,6 +723,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 
        prepare_pack_objects(&cmd, &po_args);
 
+       show_progress = !po_args.quiet && isatty(2);
+
        strvec_push(&cmd.args, "--keep-true-parents");
        if (!pack_kept_objects)
                strvec_push(&cmd.args, "--honor-pack-keep");
@@ -924,7 +926,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                        }
                        strbuf_release(&buf);
                }
-               if (!po_args.quiet && show_progress)
+               if (show_progress)
                        opts |= PRUNE_PACKED_VERBOSE;
                prune_packed_objects(opts);
 

diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 63c9a247f57f240949b48a802311cfe7ddfc0c21..fe2b493d0ee558d9125a8d93fe281e16805223a5 100755 (executable)
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -5,6 +5,7 @@ test_description='git repack works correctly'
 . ./test-lib.sh
 . "${TEST_DIRECTORY}/lib-bitmap.sh"
 . "${TEST_DIRECTORY}/lib-midx.sh"
+. "${TEST_DIRECTORY}/lib-terminal.sh"
 
 commit_and_pack () {
        test_commit "$@" 1>&2 &&
@@ -378,4 +379,10 @@ test_expect_success '--write-midx -b packs non-kept objects' '
        test_subcommand_inexact git pack-objects --honor-pack-keep <trace.txt
 '
 
+test_expect_success TTY '--quiet disables progress' '
+       test_terminal env GIT_PROGRESS_DELAY=0 \
+               git -C midx repack -ad --quiet --write-midx 2>stderr &&
+       test_must_be_empty stderr
+'
+
 test_done