diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 21:54:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 21:54:39 -0800 |
| commit | 75a7ea258c0644b79e57cab3a345807f4017dfd2 (patch) | |
| tree | 0d55ddcfcbf550dc552a55c9ce15847d1c17114d /builtin-pack-objects.c | |
| parent | 483106089aea7ad856b7f940e20db254b08bad81 (diff) | |
| parent | 4f366275189c06ec26c01ee5ace2f3831b2aa46a (diff) | |
| download | git-75a7ea258c0644b79e57cab3a345807f4017dfd2.tar.gz git-75a7ea258c0644b79e57cab3a345807f4017dfd2.tar.xz | |
Merge branch 'maint'
* maint:
pack-objects: split implications of --all-progress from progress activation
instaweb: restart server if already running
prune-packed: only show progress when stderr is a tty
Conflicts:
builtin-pack-objects.c
Diffstat (limited to 'builtin-pack-objects.c')
| -rw-r--r-- | builtin-pack-objects.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 4c91e944c..4429d53a1 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -24,6 +24,7 @@ static const char pack_usage[] = "git pack-objects [{ -q | --progress | --all-progress }]\n" + " [--all-progress-implied]\n" " [--max-pack-size=N] [--local] [--incremental]\n" " [--window=N] [--window-memory=N] [--depth=N]\n" " [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n" @@ -2124,6 +2125,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) { int use_internal_rev_list = 0; int thin = 0; + int all_progress_implied = 0; uint32_t i; const char **rp_av; int rp_ac_alloc = 64; @@ -2223,6 +2225,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) progress = 2; continue; } + if (!strcmp("--all-progress-implied", arg)) { + all_progress_implied = 1; + continue; + } if (!strcmp("-q", arg)) { progress = 0; continue; @@ -2326,6 +2332,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (keep_unreachable && unpack_unreachable) die("--keep-unreachable and --unpack-unreachable are incompatible."); + if (progress && all_progress_implied) + progress = 2; + prepare_packed_git(); if (progress) |