Re: [PATCH] merge-tree: handle directory/empty conflict correctly

2013-05-06 Thread Junio C Hamano
Andreas Jacobsen writes: > On 6 May 2013 17:20, John Keeping wrote: >> Andreas, can you try this patch and see if it fixes your test case? > > Worked perfectly. Thank you, John :) Thanks, both. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord.

Re: [PATCH] merge-tree: handle directory/empty conflict correctly

2013-05-06 Thread Andreas Jacobsen
On 6 May 2013 17:20, John Keeping wrote: > Andreas, can you try this patch and see if it fixes your test case? Worked perfectly. Thank you, John :) -- 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:

[PATCH] merge-tree: handle directory/empty conflict correctly

2013-05-06 Thread John Keeping
git-merge-tree causes a null pointer dereference when a directory entry exists in only one or two of the three trees being compared with no corresponding entry in the other tree(s). When this happens, we want to handle the entry as a directory and not attempt to mark it as a file merge. Do this b