From: Shawn Pearce <spearce@spearce.org>
To: Luben Tuikov <ltuikov@yahoo.com>
Cc: Junio C Hamano <junkio@cox.net>,
git@vger.kernel.org, Linus Torvalds <torvalds@osdl.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: git-merge-recursive segmentation error
Date: Tue, 19 Dec 2006 21:43:17 -0500 [thread overview]
Message-ID: <20061220024317.GA27918@spearce.org> (raw)
In-Reply-To: <655753.13323.qm@web31812.mail.mud.yahoo.com>
Luben Tuikov <ltuikov@yahoo.com> wrote:
> > Junio C Hamano <junkio@cox.net> writes:
> > 1510fe is buggy and it is my fault.
> >
> > For now, this _should_ get you keep going.
> >
> > However, if this fixes it for you, that means we would still
> > have the problem on Cygwin X-<.
>
> Yep -- that fixed it.
It might be a problem on Cygwin. :-)
I completely fail to see how this patch would cause a segfault
downstream in xdl_merge. All this controls is do we mmap data from
the working directory or decompress it from the ODB. Either way we
should have loaded the file size or content into the diff_filespec.
My other related change (7da41f48c) in this area has a better chance
of causing a problem as it may be bypassing loading the file content
into the diff_filespec where before we were always loading it.
However none of my testing ever showed that would cause a problem.
--
next prev parent reply other threads:[~2006-12-20 2:43 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 [this message]
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=20061220024317.GA27918@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=ltuikov@yahoo.com \
--cc=torvalds@osdl.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox