From: Luben Tuikov <ltuikov@yahoo.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: git-merge-recursive segmentation error
Date: Tue, 19 Dec 2006 18:18:59 -0800 (PST) [thread overview]
Message-ID: <427701.7195.qm@web31811.mail.mud.yahoo.com> (raw)
In-Reply-To: <Pine.LNX.4.63.0612200217300.19693@wbgn013.biozentrum.uni-wuerzburg.de>
--- Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Tue, 19 Dec 2006, Luben Tuikov wrote:
>
> > Auto-merging init/version.c
> > /home/luben/bin/git-merge: line 394: 12030
> > Segmentation fault git-merge-$strategy $common -- "$head_arg" "$@"
>
> Do you have any pointers how to get the two branches you try to merge? I'd
> be most grateful to have the sha1's of both heads, too...
The source tree is Linus' "master" tree. The destination tree
is my own "dev" tree, which I use as an intermediate tree, before
merging into my own kernel trees.
Hopefully with the backtrace I posted and with the big-bisect
results pointing to the culprit commit, someone can get a patch out
to fix this.
Luben
next prev parent reply other threads:[~2006-12-20 2:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-20 1:00 git-merge-recursive segmentation error Luben Tuikov
2006-12-20 1:10 ` Linus Torvalds
2006-12-20 2:15 ` Luben Tuikov
2006-12-20 2:25 ` Junio C Hamano
2006-12-20 2:30 ` Junio C Hamano
2006-12-20 2:33 ` Johannes Schindelin
2006-12-20 2:38 ` Luben Tuikov
2006-12-20 2:43 ` Shawn Pearce
2006-12-20 3:45 ` Junio C Hamano
2006-12-20 2:32 ` Shawn Pearce
2006-12-20 2:39 ` Luben Tuikov
2006-12-20 1:18 ` Johannes Schindelin
2006-12-20 2:18 ` Luben Tuikov [this message]
2006-12-20 2:31 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=427701.7195.qm@web31811.mail.mud.yahoo.com \
--to=ltuikov@yahoo.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.