]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3450a30) | patch
merge-recursive: ensure full index
authorDerrick Stolee <dstolee@microsoft.com>
Thu, 1 Apr 2021 01:49:56 +0000 (01:49 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Apr 2021 20:47:37 +0000 (13:47 -0700)
commitf7ef64be0cda36e5188cfc712f61ba7279311b70
treefc9f6c4c27624980dc20877713afbcbc345402b8tree | snapshot
parent3450a304aaa20707a696176441a8bbfe6d5431a3commit | diff
merge-recursive: ensure full index

Before iterating over all cache entries, ensure that a sparse index is
expanded to a full index 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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.