Merge branch 'ma/lockfile-cleanup'
commit2f76ebc93ca6bfc2aba1be330aabe391a7d093d2
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:05 +0000 (30 14:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:05 +0000 (30 14:04 +0900)
tree2aba711da4a334aeaa374345e1714973d1e92315
parent0e7af5f6d16a4cef7d981ac9631f35d146904eca
parent0fa5a2ed8d9f6d987f1ea479fe8ea56a26b89303
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
16 files changed:
apply.c
builtin/add.c
builtin/describe.c
builtin/difftool.c
builtin/gc.c
builtin/merge.c
builtin/mv.c
builtin/receive-pack.c
builtin/rm.c
bundle.c
fast-import.c
refs.c
refs/files-backend.c
rerere.c
t/helper/test-scrap-cache-tree.c
t/helper/test-write-cache.c