]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 42f44e8) | patch
merge-index: ensure full index
authorDerrick Stolee <dstolee@microsoft.com>
Thu, 1 Apr 2021 01:49:50 +0000 (01:49 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Apr 2021 20:47:21 +0000 (13:47 -0700)
commit299e2c4561ba6eb99e367b1f73b8ffb3cead5efa
tree22f3e2a45b7923929eba880e73111d062d5e76dftree | snapshot
parent42f44e84eb3be06f463ebc33baa2fc91423f4470commit | diff
merge-index: ensure full index

Before iterating over all cache entries, ensure that a sparse index is
expanded to a full one to avoid unexpected behavior.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge-index.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.