diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 08:04:05 +0300 |
| commit | 2f76ebc93ca6bfc2aba1be330aabe391a7d093d2 (patch) | |
| tree | 2aba711da4a334aeaa374345e1714973d1e92315 /fast-import.c | |
| parent | 0e7af5f6d16a4cef7d981ac9631f35d146904eca (diff) | |
| parent | 0fa5a2ed8d9f6d987f1ea479fe8ea56a26b89303 (diff) | |
Merge branch 'ma/lockfile-cleanup'
Code clean-up to adjust to a more recent lockfile API convention that
allows lockfile instances kept on the stack.
* ma/lockfile-cleanup:
lock_file: move static locks into functions
lock_file: make function-local locks non-static
refs.c: do not die if locking fails in `delete_pseudoref()`
refs.c: do not die if locking fails in `write_pseudoref()`
t/helper/test-write-cache: clean up lock-handling
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index b2338fa8eb..4d55910ab9 100644 --- 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)) |