On Sat, 18 Jul 2009, Junio C Hamano wrote: > > The unpack_trees() machinery places a special marker df_conflict_entry > to signal that no blob exists at "foo", but it will become a directory > that may have somthing underneath it, namely "foo/bar". > > Passing that df_conflict_entry marker to merged_entry() happens to remove > the "foo" in the end because the df_conflict_entry does not have any name > (hence the "error" message) and its addition in add_index_entry() is > rejected, but it is wrong. Ack. This looks like a really old bug. That whole 'df_conflict_entry' always confused me. Linus -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html