Merge branch 'jc/cache-tree' into next

diff --git a/index.c b/index.c
index ad0eafedc288f2cf6b0d7c2493495087451ef466..f92b960ae46b2d43b2f46693fe086a4c4dbe3737 100644 (file)
--- a/index.c
+++ b/index.c
@@ -18,6 +18,8 @@ static void remove_lock_file(void)
 static void remove_lock_file_on_signal(int signo)
 {
        remove_lock_file();
+       signal(SIGINT, SIG_DFL);
+       raise(signo);
 }
 
 int hold_index_file_for_update(struct cache_file *cf, const char *path)