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:

Re: Segfault in git merge-tree (1.8.2.2)

2013-05-06 Thread Andreas Jacobsen
69 in run_argv (argcp=0x7fff5fbff6e8, argv=0x7fff5fbff6e0) at git.c:492 #65 0x00011675 in main (argc=4, argv=0x7fff5fbff720) at git.c:567 Current language: auto; currently minimal On 6 May 2013 15:39, John Keeping wrote: > On Mon, May 06, 2013 at 03:02:10PM +0200, Andreas Jacobsen wrote:

Segfault in git merge-tree (1.8.2.2)

2013-05-06 Thread Andreas Jacobsen
Hi, I'm getting a segfault in git merge-tree using v1.8.2.2 on MacOS 10.8.3. I can't share the repo, but I can build patches and check if they fix the problem :) Here's a bt: (gdb) run Starting program: /usr/local/Cellar/git/1.8.2.2/libexec/git-core/git-merge-tree 027058e6ac8d03e029c4e1455bf90f6