path: root/pack-write.c
diff options
authorJunio C Hamano <>2007-11-02 23:27:37 (GMT)
committerJunio C Hamano <>2007-11-02 23:27:37 (GMT)
commit265ae188267fda441f92e513fb89641f78e982fd (patch)
tree0286ec09fc86fea191aea74b0f4864ab10380253 /pack-write.c
parent7240bfeaf7eccc6d2c4b2df07b7f33caa547953c (diff)
parent81f6654a47075a345ba63a394921f77fc87b6500 (diff)
Merge branch 'np/progress'
* 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
Diffstat (limited to 'pack-write.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/pack-write.c b/pack-write.c
index 979bdff..665e2b2 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -17,7 +17,8 @@ static int sha1_compare(const void *_a, const void *_b)
* the SHA1 hash of sorted object names. The objects array passed in
* will be sorted by SHA1 on exit.
-const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects, int nr_objects, unsigned char *sha1)
+char *write_idx_file(char *index_name, struct pack_idx_entry **objects,
+ int nr_objects, unsigned char *sha1)
struct sha1file *f;
struct pack_idx_entry **sorted_by_sha, **list, **last;