mirror of
https://github.com/git/git.git
synced 2024-06-11 13:57:04 +02:00
read-tree: force split-index mode off on --index-output
Just a (paranoid?) safety measure.. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
a76295da78
commit
5165dd598a
|
@ -2070,7 +2070,8 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
|
||||||
{
|
{
|
||||||
struct split_index *si = istate->split_index;
|
struct split_index *si = istate->split_index;
|
||||||
|
|
||||||
if (!si || (istate->cache_changed & ~EXTMASK)) {
|
if (!si || alternate_index_output ||
|
||||||
|
(istate->cache_changed & ~EXTMASK)) {
|
||||||
if (si)
|
if (si)
|
||||||
hashclr(si->base_sha1);
|
hashclr(si->base_sha1);
|
||||||
return do_write_locked_index(istate, lock, flags);
|
return do_write_locked_index(istate, lock, flags);
|
||||||
|
|
Loading…
Reference in New Issue