On Mon, Feb 22, 2016 at 10:35:34PM -0800, Junio C Hamano wrote: > > I stopped short of dropping the create_virtual_base function in the > > first patch, for reasons explained there. But if we were to do so, I > > suspect we could deprecated and eventually drop "apply --no-add", too. > > Thanks. I think the "virtual" stuff started its life outside > sh-setup but later was moved there for p4merge. The log message for > 4549162e (mergetools/p4merge: create a base if none available, > 2013-03-13) seems to indicate that using an empty file does not work > well over there as you suspected, so unfortunately we cannot lose it > just yet.
Oh, indeed. I did find that commit in my git-blaming, but failed to actually read it carefully. :) With that, yeah, I agree that we cannot drop the virtual-base thing, and my 3 patches are fine as-is. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
