diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-01-24 16:38:29 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-01-24 10:09:18 -0800 |
commit | ef5b3a6c5e24c54ba4436e225b9431c63ab163f0 (patch) | |
tree | af11b8f8180dff20a3cee936c7935e455ab3d963 /t/t4013/diff.diff-tree_--pretty_-p_initial | |
parent | read-cache.c: move tempfile creation/cleanup out of write_shared_index (diff) | |
download | tgif-ef5b3a6c5e24c54ba4436e225b9431c63ab163f0.tar.xz |
read-cache: don't write index twice if we can't write shared index
In a0a967568e ("update-index --split-index: do not split if $GIT_DIR is
read only", 2014-06-13), we tried to make sure we can still write an
index, even if the shared index can not be written.
We did so by just calling 'do_write_locked_index()' just before
'write_shared_index()'. 'do_write_locked_index()' always at least
closes the tempfile nowadays, and used to close or commit the lockfile
if COMMIT_LOCK or CLOSE_LOCK were given at the time this feature was
introduced. COMMIT_LOCK or CLOSE_LOCK is passed in by most callers of
'write_locked_index()'.
After calling 'write_shared_index()', we call 'write_split_index()',
which calls 'do_write_locked_index()' again, which then tries to use the
closed lockfile again, but in fact fails to do so as it's already
closed. This eventually leads to a segfault.
Make sure to write the main index only once.
[nd: most of the commit message and investigation done by Thomas, I only
tweaked the solution a bit]
Helped-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff-tree_--pretty_-p_initial')
0 files changed, 0 insertions, 0 deletions