]> git.ipfire.org Git - thirdparty/git.git/commit - config.c
Merge branch 'ma/lockfile-fixes'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 04:11:21 +0000 (13:11 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Nov 2017 04:11:21 +0000 (13:11 +0900)
commit0b646bcac96a57e345887e607e0b8c9a64ff262a
tree4c4e0e29d1743413c7fa0e1172ccebb7cbc37191
parentcb5918aa0d50f50e83787f65c2ddc3dcb10159fe
parentb74c90fb419b002c664b0236f2941c34786b18b9
Merge branch 'ma/lockfile-fixes'

An earlier update made it possible to use an on-stack in-core
lockfile structure (as opposed to having to deliberately leak an
on-heap one).  Many codepaths have been updated to take advantage
of this new facility.

* ma/lockfile-fixes:
  read_cache: roll back lock in `update_index_if_able()`
  read-cache: leave lock in right state in `write_locked_index()`
  read-cache: drop explicit `CLOSE_LOCK`-flag
  cache.h: document `write_locked_index()`
  apply: remove `newfd` from `struct apply_state`
  apply: move lockfile into `apply_state`
  cache-tree: simplify locking logic
  checkout-index: simplify locking logic
  tempfile: fix documentation on `delete_tempfile()`
  lockfile: fix documentation on `close_lock_file_gently()`
  treewide: prefer lockfiles on the stack
  sha1_file: do not leak `lock_file`
builtin/checkout.c
builtin/commit.c
builtin/diff.c
cache-tree.c
cache.h
config.c
sequencer.c
sha1_file.c
wt-status.c