Merge branch 'sg/complete-paths'

diff --git a/fast-import.c b/fast-import.c
index b2338fa8eb20d5c52d2bf03d73dca050721c292c..4d55910ab9a0634a553c01643035ef9afe6034c7 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1817,7 +1817,7 @@ static void dump_marks_helper(FILE *f,
 
 static void dump_marks(void)
 {
-       static struct lock_file mark_lock;
+       struct lock_file mark_lock = LOCK_INIT;
        FILE *f;
 
        if (!export_marks_file || (import_marks_file && !import_marks_file_done))