diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-31 04:38:15 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-31 06:25:05 +0400 |
| commit | c94736a27f89bfc268aed0de7264deecdc136a58 (patch) | |
| tree | e8307e0e18ce73552f826928d5bcd85325e366e8 /tree.h | |
| parent | 4258c212ca2c3674be4b7e00a19db705eee77a48 (diff) | |
merge-recursive: don't segfault while handling rename clashes
When a branch moves A to B while the other branch created B (or moved C to
B), the code tried to rename one of them to B~something to preserve both
versions, and failed to register temporary resolution for the original
path B at stage#0 during virtual ancestor computation. This left the
index in unmerged state and caused a segfault.
A better solution is to merge these two versions of B's in place and use
the (potentially conflicting) result as the intermediate merge result in
the virtual ancestor.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree.h')
0 files changed, 0 insertions, 0 deletions