Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

diff --git a/progress.h b/progress.h
index 7b725acc8d7b6cbaa5e36743b42b29d8c22d868d..847338911fbb6cf359f39ea0cb7a406297b61812 100644 (file)
--- a/progress.h
+++ b/progress.h
@@ -4,7 +4,7 @@
 struct progress;
 
 void display_throughput(struct progress *progress, uint64_t total);
-int display_progress(struct progress *progress, uint64_t n);
+void display_progress(struct progress *progress, uint64_t n);
 struct progress *start_progress(const char *title, uint64_t total);
 struct progress *start_sparse_progress(const char *title, uint64_t total);
 struct progress *start_delayed_progress(const char *title, uint64_t total);