aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2008-05-02 15:11:47 -0400
committerJunio C Hamano <gitster@pobox.com>2008-05-03 18:35:38 -0700
commitbcd7954e217994fafabe5106e56829c8a2cb7e99 (patch)
treed080b22339bbaef400d3e32a4074c32b4007024b
parenta7de713089082005d14679b694fd3999978fb735 (diff)
downloadgit-bcd7954e217994fafabe5106e56829c8a2cb7e99.tar.gz
git-bcd7954e217994fafabe5106e56829c8a2cb7e99.tar.xz
pack-objects: simplify the condition associated with --all-progress
Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-pack-objects.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index afbf3ddc6..b4a63d246 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -452,11 +452,10 @@ static void write_pack_file(void)
struct sha1file *f;
off_t offset, offset_one, last_obj_offset = 0;
struct pack_header hdr;
- int do_progress = progress >> pack_to_stdout;
uint32_t nr_remaining = nr_result;
time_t last_mtime = 0;
- if (do_progress)
+ if (progress > pack_to_stdout)
progress_state = start_progress("Writing objects", nr_result);
written_list = xmalloc(nr_objects * sizeof(*written_list));