From: Luben Tuikov <ltuikov@yahoo.com>
To: git@vger.kernel.org
Subject: git-merge-recursive segmentation error
Date: Tue, 19 Dec 2006 17:00:38 -0800 (PST) [thread overview]
Message-ID: <693577.67723.qm@web31813.mail.mud.yahoo.com> (raw)
So, I'm merging Linux master into my own dev tree and
here is what I get in syslog:
Dec 19 16:56:38 lion kernel: [ 1704.395478] git-merge-recur[12030] general protection rip:4285ef
rsp:7ffff727bf40 error:0
and on the command line:
...
Auto-merging init/Kconfig
Auto-merging init/version.c
/home/luben/bin/git-merge: line 394: 12030 Segmentation fault git-merge-$strategy $common --
"$head_arg" "$@"
Merge with strategy recursive failed.
I'm running "next".
Are the people aware of this issue?
It is 100% reproducible on my trees.
Anyone has a patch?
Luben
next reply other threads:[~2006-12-20 1:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-20 1:00 Luben Tuikov [this message]
2006-12-20 1:10 ` git-merge-recursive segmentation error 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
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=693577.67723.qm@web31813.mail.mud.yahoo.com \
--to=ltuikov@yahoo.com \
--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.