![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Clemens Buchacher <drizzd@aon.at> | |
| Sun, 5 Apr 2009 00:46:59 +0000 (02:46 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 5 Apr 2009 07:26:32 +0000 (00:26 -0700) | ||
| commit | 0eb6574c24241b1e54be1ddff60287544faaf8d8 | |
| tree | 79aa4a89f881e93d25c3d7a82efd719e97854388 | tree | snapshot |
| parent | f37ae35e73dbc492bd3ca24badb309817ecaaa67 | commit | diff |
update cache for conflicting submodule entries
When merging merge bases during a recursive merge we do not want to
leave any unmerged entries. Otherwise we cannot create a temporary
tree for the recursive merge to work with.
We failed to do so in case of a submodule conflict between merge
bases, causing a NULL pointer dereference in the next step of the
recursive merge.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When merging merge bases during a recursive merge we do not want to
leave any unmerged entries. Otherwise we cannot create a temporary
tree for the recursive merge to work with.
We failed to do so in case of a submodule conflict between merge
bases, causing a NULL pointer dereference in the next step of the
recursive merge.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diff | blob | history | |
| t/t7405-submodule-merge.sh | diff | blob | history |