diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-07-30 17:38:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-30 19:25:05 -0700 |
| commit | c94736a27f89bfc268aed0de7264deecdc136a58 (patch) | |
| tree | e8307e0e18ce73552f826928d5bcd85325e366e8 /builtin-push.c | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-c94736a27f89bfc268aed0de7264deecdc136a58.tar.xz | |
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 'builtin-push.c')
0 files changed, 0 insertions, 0 deletions