From: Nicolas Pitre <nico@cam.org>
Date: Fri, 2 May 2008 19:11:47 +0000 (-0400)
Subject: pack-objects: simplify the condition associated with --all-progress
X-Git-Tag: v1.5.6-rc0~33^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bcd7954e217994fafabe5106e56829c8a2cb7e99;p=git.git

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>
---

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));