Re: What's new in git.git master branch

Junio C Hamano [off-list ref] writes:

Fredrik Kuivinen [off-list ref] writes:

quoted

It turns out that this change breaks the directory/file conflict
handling in git-merge-recursive.

   git-ls-tree -r -z <tree SHA1>

Should we do it that way or should ls-tree be changed?

Ouch.  Sorry, I should have been more careful.

So we updated ls-tree to take -t flag which shows tree entries
under -r flag.  I'd appreciate if you test the attached patch.

Also I think I broke the case where base trees need to be merged
in 58cce8a8 commit (I changed processEntry not to collapse the
index entry when file content changes cannot be automerged, but
that change has to be done only for the final merge, and merges
between base trees must collapse to be able to write the index
file out as a tree).

I think that the above worry was unfounded, because the
updateFileExt call I removed to prevent it from collapsing the
unmerged entries was in effect only in !cacheOnly case
(i.e. callDepth == 0).