Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
On 27/03/13 20:01, Jeff King wrote: On Wed, Mar 27, 2013 at 07:45:21PM +, John Keeping wrote: On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote: Charlie Smurthwaite writes: Yes, I would need to be able to do this on a bare repo for my use case. And if it's on the server

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
On 27/03/13 18:06, Jed Brown wrote: Charlie Smurthwaite writes: I am also using this to obtain a diff that would be applied if a merge were to be run. Is there a better way to obtain this information that is more commonly used? You can do an actual merge using detached HEAD: $ git

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
On 27/03/13 17:06, Junio C Hamano wrote: Charlie Smurthwaite writes: I am experiencing a segmentation fault in various versions of Git using different repositories. ... Test Command git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f 8d6bdf012941d876b2279994e02f1bb0d5c26e7d

Re: Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
On 27/03/13 17:06, Junio C Hamano wrote: Charlie Smurthwaite writes: I am experiencing a segmentation fault in various versions of Git using different repositories. ... Test Command git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f 8d6bdf012941d876b2279994e02f1bb0d5c26e7d

Segfault with merge-tree on multiple Git versions

2013-03-27 Thread Charlie Smurthwaite
/Linux Git: git version 1.8.2 Output: charlie@codebase-staging:~/mail$ git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f 8d6bdf012941d876b2279994e02f1bb0d5c26e7d d5ef97ac407d945f231cd7c8fb1cfe48b3a12083 Segmentation fault Charlie Smurthwaite aTech Media tel. 01202 901 222 (ext. 603) email