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

Re: Strange effect merging empty file

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:21

Possibly related (same subject, not in this thread)

Jeff King [off-list ref] writes:
That is a slight layering violation, in that we are making assumptions
about how the diffcore-rename subsystem works.
I do not think I have to say any more than that.  The special case we want
to have is for the "empty to empty" case and nothing else, and I do not
want to see people having to remember to look at the merge-recursive code
if/when rename detection starts to treat "empty to small" as "rename with
minor modification."
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help