undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repack: make '--quiet' disable progress

Browse Source 
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>
This commit is contained in:
Derrick Stolee 2021-12-20 14:48:11 +00:00 committed by Junio C Hamano
parent e4d0c11c04
commit 47ca93d071
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-repack.txt
View File

@ -76,8 +76,9 @@ to the new separate pack will be written.
linkgit:git-pack-objects[1]. linkgit:git-pack-objects[1].
-q:: -q::
Pass the `-q` option to 'git pack-objects'. See --quiet::
linkgit:git-pack-objects[1]. Show no progress over the standard error stream and pass the `-q`
option to 'git pack-objects'. See linkgit:git-pack-objects[1].
-n:: -n::
Do not update the server information with Do not update the server information with

6
builtin/repack.c
View File

@ -610,7 +610,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
struct tempfile *refs_snapshot = NULL; struct tempfile *refs_snapshot = NULL;
int i, ext, ret; int i, ext, ret;
FILE *out; FILE *out;
int show_progress = isatty(2); int show_progress;
/* variables to be filled by option parsing */ /* variables to be filled by option parsing */
int pack_everything = 0; 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); prepare_pack_objects(&cmd, &po_args);
show_progress = !po_args.quiet && isatty(2);
strvec_push(&cmd.args, "--keep-true-parents"); strvec_push(&cmd.args, "--keep-true-parents");
if (!pack_kept_objects) if (!pack_kept_objects)
strvec_push(&cmd.args, "--honor-pack-keep"); 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); strbuf_release(&buf);
} }
if (!po_args.quiet && show_progress) if (show_progress)
opts |= PRUNE_PACKED_VERBOSE; opts |= PRUNE_PACKED_VERBOSE;
prune_packed_objects(opts); prune_packed_objects(opts);

7
t/t7700-repack.sh
View File

@ -5,6 +5,7 @@ test_description='git repack works correctly'
. ./test-lib.sh . ./test-lib.sh
. "${TEST_DIRECTORY}/lib-bitmap.sh" . "${TEST_DIRECTORY}/lib-bitmap.sh"
. "${TEST_DIRECTORY}/lib-midx.sh" . "${TEST_DIRECTORY}/lib-midx.sh"
. "${TEST_DIRECTORY}/lib-terminal.sh"
commit_and_pack () { commit_and_pack () {
test_commit "$@" 1>&2 && 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_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 test_done