summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@fluxnic.net>2009-11-23 17:43:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-24 05:33:09 (GMT)
commit4f366275189c06ec26c01ee5ace2f3831b2aa46a (patch)
tree7e31f673ec8a7a490628aa19860e9a4d51b1e30c /bundle.c
parent0b624b4ceee63ce45135cdbb80f2807c20b48646 (diff)
downloadgit-4f366275189c06ec26c01ee5ace2f3831b2aa46a.zip
git-4f366275189c06ec26c01ee5ace2f3831b2aa46a.tar.gz
git-4f366275189c06ec26c01ee5ace2f3831b2aa46a.tar.bz2
pack-objects: split implications of --all-progress from progress activation
Currently the --all-progress flag is used to use force progress display during the writing object phase even if output goes to stdout which is primarily the case during a push operation. This has the unfortunate side effect of forcing progress display even if stderr is not a terminal. Let's introduce the --all-progress-implied argument which has the same intent except for actually forcing the activation of any progress display. With this, progress display will be automatically inhibited whenever stderr is not a terminal, or full progress display will be included otherwise. This should let people use 'git push' within a cron job without filling their logs with useless percentage displays. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Tested-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundle.c b/bundle.c
index df95e15..717a712 100644
--- a/bundle.c
+++ b/bundle.c
@@ -351,7 +351,7 @@ int create_bundle(struct bundle_header *header, const char *path,
/* write pack */
argv_pack[0] = "pack-objects";
- argv_pack[1] = "--all-progress";
+ argv_pack[1] = "--all-progress-implied";
argv_pack[2] = "--stdout";
argv_pack[3] = "--thin";
argv_pack[4] = NULL;