On 27/03/13 17:06, Junio C Hamano wrote:
Charlie Smurthwaite <charlie@xxxxxxxxxxxxxx> writes:
I am experiencing a segmentation fault in various versions of Git using
different repositories.
...
Test Command
git merge-tree 26bb22a052fef9f74063afd4fc6fc11fe200b19f
8d6bdf012941d876b2279994e02f1bb0d5c26e7d
d5ef97ac407d945f231cd7c8fb1cfe48b3a12083
Thanks for a report (and thanks to John and Thomas for finding the
typo).
Nobody I know uses merge-tree; the last real change we did was back
from July 2010, and the only reason I was looking at it recently was
because I was planning to write a new merge strategy using it.
Mind if I ask what you are using it for?
Thank you everybody for investigating this and creating a patch. Can I
assume that this fix will reach somebody who can apply it to master?
With regard our use, we run an SCM hosting service http://codebasehq.com
and are in the process of deploying a merge-request feature. We use
git-merge-tree to determine whether a Git merge can be completed
automatically (without manual conflict resolution), and if so offer the
user a button to execute an actual merge. If there is a better way to do
this, I'd be happy to consider it.
Charlie
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html