mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

relax usage of the progress API

Browse Source 
Since it is now OK to pass a null pointer to display_progress() and
stop_progress() resulting in a no-op, then we can simplify the code
and remove a bunch of lines by not making those calls conditional all
the time.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nicolas Pitre
2007-10-30 14:57:33 -04:00
committed by Junio C Hamano
parent dc6a0757c4
commit 4d4fcc5451
5 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unpack-trees.c
View File

@ -316,9 +316,8 @@ static void check_updates(struct cache_entry **src, int nr,
while (nr--) {
struct cache_entry *ce = *src++;
if (total)
if (!ce->ce_mode || ce->ce_flags & mask)
display_progress(progress, ++cnt);
if (!ce->ce_mode || ce->ce_flags & mask)
display_progress(progress, ++cnt);
if (!ce->ce_mode) {
if (o->update)
unlink_entry(ce->name, last_symlink);
@ -332,8 +331,7 @@ static void check_updates(struct cache_entry **src, int nr,
}
}
}
if (total)
stop_progress(&progress);
stop_progress(&progress);
}
int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)