Merge branch 'np/progress'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2007 23:27:37 +0000 (16:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2007 23:27:37 +0000 (16:27 -0700)
* np/progress:
Show total transferred as part of throughput progress
make sure throughput display gets updated even if progress doesn't move
return the prune-packed progress display to the inner loop
add throughput display to git-push
add some copyright notice to the progress display code
add throughput display to index-pack
add throughput to progress display
relax usage of the progress API
make struct progress an opaque type
prune-packed: don't call display_progress() for every file
Stop displaying "Pack pack-$ID created." during git-gc
Teach prune-packed to use the standard progress meter
Change 'Deltifying objects' to 'Compressing objects'
fix for more minor memory leaks
fix const issues with some functions
pack-objects.c: fix some global variable abuse and memory leaks
pack-objects: no delta possible with only one object in the list
cope with multiple line breaks within sideband progress messages
more compact progress display

1  2 
pack-write.c
pack.h
diff --cc pack-write.c
Simple merge
diff --cc pack.h
Simple merge