merge-recursive: fix rename/rename(1to2) for working tree with a binary

[thirdparty/git.git] / progress.c

diff --git a/progress.c b/progress.c
index 19805ac6461ba3b1300e542989189f76738c1407..75633e9c5e91a959e624ea38898933ea20d1daaa 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -8,6 +8,7 @@
  * published by the Free Software Foundation.
  */
 
+#define GIT_TEST_PROGRESS_ONLY
 #include "cache.h"
 #include "gettext.h"
 #include "progress.h"
@@ -52,7 +53,6 @@ static volatile sig_atomic_t progress_update;
  */
 int progress_testing;
 uint64_t progress_test_ns = 0;
-void progress_test_force_update(void); /* To silence -Wmissing-prototypes */
 void progress_test_force_update(void)
 {
        progress_update = 1;