Merge branch 'maint'

diff --git a/unpack-trees.c b/unpack-trees.c
index a20639be70edb13bc87353a69a13f17994ea41a5..43ed12484f6eb8bb828987872b2782182e579b9f 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -278,7 +278,7 @@ static void unlink_entry(char *name)
        }
 }
 
-static volatile int progress_update = 0;
+static volatile sig_atomic_t progress_update;
 
 static void progress_interval(int signum)
 {