Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15

Re: [BUG] diffcore-rename with duplicate tree entries can segfault

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:03:55

Possibly related (same subject, not in this thread)

Jeff King [off-list ref] writes:
But we can also do that with a hash table, or an auxiliary sorted array.
And sure enough, that's exactly what the rename_dst array is.
...
which I think is a pretty simple and sane fix.
Yeah, good observation.
So to go forward, I'm happy to prepare a patch, but I'd like to know:

  1. Does something like the above look reasonable to you (I'd probably
     refactor it to avoid the bizarre return value semantics from
     locate_rename_dst, though)?

  2. If so, do you want something minimal like what's above, or do you
     mind if I build it on top of a hashmap conversion? I suspect the
     logic may also end up more clear with the hashmap (since inserting
     versus lookup will be more distinct in the callers).
No, I don't mind.  The diff-b-m topic seems to need a lot deeper
rethink than I originally anticipated anyway, and it can wait for a
clean-up to use hashmap to stabilize.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help