diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-02 21:13:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-02 21:13:27 -0700 |
| commit | 9ac54d0f59978b92201e3ca728eed0ea7545667a (patch) | |
| tree | 4698efc962d4ab9b4dc9be4c559a100c1924a3a8 | |
| parent | b65f30b6b3bf34831b32a1b209bc1955f2bf79df (diff) | |
| parent | df995c7dd21bca9c61f9e5480fdfc1a015b4f1a0 (diff) | |
| download | git-9ac54d0f59978b92201e3ca728eed0ea7545667a.tar.gz git-9ac54d0f59978b92201e3ca728eed0ea7545667a.tar.xz | |
Merge branch 'tu/gc-auto-quiet'
"gc --auto" notified the user that auto-packing has triggered even
under the "--quiet" option.
* tu/gc-auto-quiet:
silence git gc --auto --quiet output
| -rw-r--r-- | builtin/gc.c | 4 | ||||
| -rwxr-xr-x | t/t5400-send-pack.sh | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 6d46608fc..6be6c8d65 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -217,9 +217,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) */ if (!need_to_gc()) return 0; - if (quiet) - fprintf(stderr, _("Auto packing the repository for optimum performance.\n")); - else + if (!quiet) fprintf(stderr, _("Auto packing the repository for optimum performance. You may also\n" "run \"git gc\" manually. See " diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 250c720c1..78ab17793 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -174,8 +174,7 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' ' cd parent && echo "Even more text" >>file.txt && git commit -a -m "Third commit" && - git send-pack ../child HEAD:refs/heads/test_auto_gc >output 2>&1 && - grep "Auto packing the repository for optimum performance." output + git send-pack ../child HEAD:refs/heads/test_auto_gc ) && test ! -e child/.git/objects/tmp_test_object ' |