]> git.ipfire.org Git - thirdparty/git.git/commit - t/t1700-split-index.sh
read-cache: don't write index twice if we can't write shared index
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Wed, 24 Jan 2018 09:38:29 +0000 (16:38 +0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jan 2018 18:09:18 +0000 (10:09 -0800)
commitef5b3a6c5e24c54ba4436e225b9431c63ab163f0
treeaf11b8f8180dff20a3cee936c7935e455ab3d963
parent59f9d2dd60f97c55c92c3273903f64048a27e513
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>
read-cache.c
t/t1700-split-index.sh