Charlie Smurthwaite char...@atechmedia.com writes:
I am experiencing a segmentation fault in various versions of Git using
different repositories. Specifically, I have reproduced it using a
public repo and the latest stable Git version. Other repos trigger the
error on different versions.
On Wed, Mar 27, 2013 at 04:53:27PM +0100, thomas wrote:
Charlie Smurthwaite char...@atechmedia.com writes:
I am experiencing a segmentation fault in various versions of Git using
different repositories. Specifically, I have reproduced it using a
public repo and the latest stable Git
John Keeping j...@keeping.me.uk writes:
Looks like a simple typo in merge-tree.c::unresolved:
Thanks.
-- 8 --
merge-tree: fix typo in merge-tree.c::unresolved
When calculating whether there is a d/f conflict, the calculation of
whether both sides are directories generates an incorrect
Charlie Smurthwaite char...@atechmedia.com writes:
I am experiencing a segmentation fault in various versions of Git using
different repositories.
...
Test Command
git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f
8d6bdf012941d876b2279994e02f1bb0d5c26e7d
On 27/03/13 17:06, Junio C Hamano wrote:
Charlie Smurthwaite char...@atechmedia.com writes:
I am experiencing a segmentation fault in various versions of Git using
different repositories.
...
Test Command
git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f
Charlie Smurthwaite char...@atechmedia.com 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 checkout --detach
Charlie Smurthwaite char...@atechmedia.com 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, you don't want this to be observable, so
you don't want HEAD to move around. I don't know a better way than:
$ git clone --shared -b
On Wed, Mar 27, 2013 at 02:16:24PM -0500, Jed Brown wrote:
Charlie Smurthwaite char...@atechmedia.com 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, you don't want this to be observable, so
you don't want HEAD to move around. I
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 char...@atechmedia.com 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, you don't
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 char...@atechmedia.com writes:
Yes, I would need to be able to do this on a bare repo for my use case.
And if
10 matches
Mail list logo
