The delta island code always prints "Marked %d islands", even if progress has been suppressed with --no-progress or by sending stderr to a non-tty. Let's pass a progress boolean to load_delta_islands(). We already do the same thing for the progress meter in resolve_tree_islands(). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			19 lines
		
	
	
		
			572 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			19 lines
		
	
	
		
			572 B
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef DELTA_ISLANDS_H
 | 
						|
#define DELTA_ISLANDS_H
 | 
						|
 | 
						|
struct commit;
 | 
						|
struct object_id;
 | 
						|
struct packing_data;
 | 
						|
struct repository;
 | 
						|
 | 
						|
int island_delta_cmp(const struct object_id *a, const struct object_id *b);
 | 
						|
int in_same_island(const struct object_id *, const struct object_id *);
 | 
						|
void resolve_tree_islands(struct repository *r,
 | 
						|
			  int progress,
 | 
						|
			  struct packing_data *to_pack);
 | 
						|
void load_delta_islands(struct repository *r, int progress);
 | 
						|
void propagate_island_marks(struct commit *commit);
 | 
						|
int compute_pack_layers(struct packing_data *to_pack);
 | 
						|
 | 
						|
#endif /* DELTA_ISLANDS_H */
 |