git-am: Add am.keepcr and --no-keep-cr to override it

diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
index be99eb0ac4162411d63d10003fa80e12206b8cc6..f9463deec2f5a5875ee9870e67c990a2fea942db 100644 (file)
--- a/builtin-prune-packed.c
+++ b/builtin-prune-packed.c
@@ -71,7 +71,7 @@ void prune_packed_objects(int opts)
 
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
-       int opts = VERBOSE;
+       int opts = isatty(2) ? VERBOSE : 0;
        const struct option prune_packed_options[] = {
                OPT_BIT('n', "dry-run", &opts, "dry run", DRY_RUN),
                OPT_NEGBIT('q', "quiet", &opts, "be quiet", VERBOSE),