| commit | 5dc16756b220429ca91cbf263b936764f83cd4bb | |
| author | Derrick Stolee <dstolee@microsoft.com> | |
| Wed, 8 Sep 2021 01:42:28 +0000 (8 01:42 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Sep 2021 05:41:09 +0000 (7 22:41 -0700) | ||
| tree | 2367982a35834fedb830ea28d46c0c216b320daf | treesnapshot (tar.gz zip) |
| parent | 72d84ea347249c525712987b85ab16fdbb5e38c1 | commitdiff |
sparse-index: silently return when cache tree fails
If cache_tree_update() returns a non-zero value, then it could not
create the cache tree. This is likely due to a path having a merge
conflict. Since we are already returning early, let's return silently to
avoid making it seem like we failed to write the index at all.
If we remove our dependence on the cache tree within
convert_to_sparse(), then we could still recover from this scenario and
have a sparse index.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If cache_tree_update() returns a non-zero value, then it could not
create the cache tree. This is likely due to a path having a merge
conflict. Since we are already returning early, let's return silently to
avoid making it seem like we failed to write the index at all.
If we remove our dependence on the cache tree within
convert_to_sparse(), then we could still recover from this scenario and
have a sparse index.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sparse-index.c | diffblobblamehistory |