Skip to contentSkip to conversation

gc: fix regression in 7b0f229222 impacting --quiet

PATCH In review Ævar Arnfjörð Bjarmason 3 participants 3 messages Sep 19, 2018 – Sep 20, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gc: fix regression in 7b0f229222 impacting --quiet

Fix a regression in my recent 7b0f229222 ("commit-graph write: add progress output", 2018-09-17), the newly added progress output for "commit-graph write" didn't check the --quiet option.

Do so, and add a test asserting that this works as expected. Since the TTY perquisite isn't available everywhere let's add a version of this that both requires and doesn't require that. This test might be overly specific and will break if new progress output is added, but I think it'll serve as a good reminder to test the undertested progress mode(s).

---
 builtin/gc.c  |  2 +-
 t/t6500-gc.sh | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
builtin/gc.c +1 -1
index 06ddd3aea5..91ffb1a803 100644
@@ -647,7 +647,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 
 	if (gc_write_commit_graph)
 		write_commit_graph_reachable(get_object_directory(), 0,
-					     !daemonized);
+					     !quiet && !daemonized);
 
 	if (auto_gc && too_many_loose_objects())
 		warning(_("There are too many unreachable loose objects; "
t/t6500-gc.sh +21 -0
index 818435f04e..6183702c30 100755
@@ -4,6 +4,7 @@ test_description='basic git gc tests
 '
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success 'setup' '
 	# do not let the amount of physical memory affects gc
@@ -99,6 +100,26 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
 	test_line_count = 2 new # There is one new pack and its .idx
 '
 
+test_expect_success 'gc --no-quiet' '
+	git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	! test -s stdout &&
+	test_line_count = 1 stderr &&
+	test_i18ngrep "Computing commit graph generation numbers" stderr
+'
+
+test_expect_success TTY 'with TTY: gc --no-quiet' '
+	test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	! test -s stdout &&
+	test_i18ngrep "Enumerating objects" stderr &&
+	test_i18ngrep "Computing commit graph generation numbers" stderr
+'
+
+test_expect_success 'gc --quiet' '
+	git -c gc.writeCommitGraph=true gc --quiet >stdout 2>stderr &&
+	! test -s stdout &&
+	! test -s stderr
+'
+
 run_and_wait_for_auto_gc () {
 	# We read stdout from gc for the side effect of waiting until the
 	# background gc process exits, closing its fd 9.  Furthermore, the
Signature · 1 line
2.19.0.444.g18242da7ef
#1 lore raw
Quoted 3 lines · Ævar Arnfjörð Bjarmason

Fix a regression in my recent 7b0f229222 ("commit-graph write: add progress output", 2018-09-17), the newly added progress output for "commit-graph write" didn't check the --quiet option.

s/, t/. T/, perhaps. Maybe also s/did/does/.

Quoted 2 lines

Do so, and add a test asserting that this works as expected. Since the TTY perquisite isn't available everywhere let's add a version of this

s/perq/prereq/

t/t6500-gc.sh test_expect_success 'auto gc with too many loose objects does not attempt to cre · line 105

Quoted 8 lines

that both requires and doesn't require that. This test might be overly specific and will break if new progress output is added, but I think it'll serve as a good reminder to test the undertested progress mode(s).

t/t6500-gc.sh +3 -0
+test_expect_success 'gc --no-quiet' '
+       git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+       ! test -s stdout &&

test_must_be_empty for easier debugging?

Quoted 3 lines
t/t6500-gc.sh +3 -0
+       test_line_count = 1 stderr &&
+       test_i18ngrep "Computing commit graph generation numbers" stderr
+'
#2 lore raw
Quoted 4 lines · Martin Ågren
Quoted 3 lines · Ævar Arnfjörð Bjarmason

Fix a regression in my recent 7b0f229222 ("commit-graph write: add progress output", 2018-09-17), the newly added progress output for "commit-graph write" didn't check the --quiet option.

Thanks for fixing this issue. Sorry I missed it in review.

I looked through the patch and didn't find anything more than Martin already did. I appreciate the tests.

Thanks,
-Stolee