mirror of
https://github.com/git/git.git
synced 2024-11-13 20:53:02 +01:00
8e86c155d2
If closing an open lockfile fails, then we cannot be sure of the contents of the lockfile, so there is nothing sensible to do but delete it. This change also insures that the lock_file object is left in a defined state in this error path (namely, unlocked). The only caller that is ultimately affected by this change is try_merge_strategy() -> write_locked_index(), which can call close_lock_file() via various execution paths. This caller uses a static lock_file object which previously could have been reused after a failed close_lock_file() even though it was still in locked state. This change causes the lock_file object to be unlocked on failure, thus fixing this error-handling path. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| api-allocation-growing.txt | ||
| api-argv-array.txt | ||
| api-builtin.txt | ||
| api-config.txt | ||
| api-credentials.txt | ||
| api-decorate.txt | ||
| api-diff.txt | ||
| api-directory-listing.txt | ||
| api-gitattributes.txt | ||
| api-grep.txt | ||
| api-hashmap.txt | ||
| api-history-graph.txt | ||
| api-in-core-index.txt | ||
| api-index-skel.txt | ||
| api-index.sh | ||
| api-lockfile.txt | ||
| api-merge.txt | ||
| api-object-access.txt | ||
| api-parse-options.txt | ||
| api-quote.txt | ||
| api-ref-iteration.txt | ||
| api-remote.txt | ||
| api-revision-walking.txt | ||
| api-run-command.txt | ||
| api-setup.txt | ||
| api-sha1-array.txt | ||
| api-sigchain.txt | ||
| api-strbuf.txt | ||
| api-string-list.txt | ||
| api-trace.txt | ||
| api-tree-walking.txt | ||
| api-xdiff-interface.txt | ||
| bitmap-format.txt | ||
| http-protocol.txt | ||
| index-format.txt | ||
| pack-format.txt | ||
| pack-heuristics.txt | ||
| pack-protocol.txt | ||
| protocol-capabilities.txt | ||
| protocol-common.txt | ||
| racy-git.txt | ||
| send-pack-pipeline.txt | ||
| shallow.txt | ||
| trivial-merge.txt | ||