Hi, On Tue, 26 Dec 2006, Shawn Pearce wrote: > So I've been able to reproduce the segfault that was earlier reported in > xdl_merge. Unfortunately its in the repo that I can't publish. So here I am again, wanting to help, being unable to. *Sigh*. At least this time it is due to legal reasons, not unknown ones. As you said in another mail, Junio suggested using git-merge-file on the blobs themselves. This is a little tricky, since git-merge-file does not read blobs; only files. I'd do this: - in merge-recursive.c just before line 658 I'd add an fprintf(stderr, "xdl_merge: %s %s %s\n", sha1_to_hex(a->sha1), sha1_to_hex(o->sha1), sha1_to_hex(b->sha1)); - run the merge until it segfaults - get the blobs by using the last three SHA1's in the output by $ git-show <sha1> > a # or "o" or "b" - $ git merge-file -p a o b >/dev/null This command line ensures that "a" is not edited, and you can repeat the merge as often as needed. If this still segfaults, I'd like to have the files privately (I will not look at the contents, as they are irrelevant to this particular bug). Ciao, Dscho - 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