summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-09-05 08:15:15 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-06 17:19:54 +0900
commitee4d8e455c0981269213eccfd788a9bb9adf77d9 (patch)
treef7cce828a422479c68db28849956c7f60186b35c /Documentation/git-merge-index.txt
parentlockfile: update lifetime requirements in documentation (diff)
downloadtgif-ee4d8e455c0981269213eccfd788a9bb9adf77d9.tar.xz
ref_lock: stop leaking lock_files
Since the tempfile code recently relaxed the rule that tempfile structs (and thus locks) need to hang around forever, we no longer have to leak our lock_file structs. In fact, we don't even need to heap-allocate them anymore, since their lifetime can just match that of the surrounding ref_lock (and if we forget to delete a lock, the effect is the same as before: it will eventually go away at program exit). Note that there is a check in unlock_ref() to only rollback a lock file if it has been allocated. We don't need that check anymore; we zero the ref_lock (and thus the lock_file), so at worst we pass a NULL pointer to delete_tempfile(), which considers that a noop. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions