From: Mathias Lafeldt <misfire@debugon.org>
To: Klas Lindberg <klas.lindberg@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge-tree segfault
Date: Sat, 30 Oct 2010 19:26:26 +0200 [thread overview]
Message-ID: <4CCC5542.8020105@debugon.org> (raw)
In-Reply-To: <AANLkTinJQCqwRZpbO66VHrgxezedS1Ay3nr9kayiODi9@mail.gmail.com>
On 10/28/2010 10:16 PM, Klas Lindberg wrote:
> I haven't tried this on newer versions of git, but the release notes
> for later releases don't mention merge-tree anywhere, so...
>
> git version: 1.7.0
> uname -a: Linux tor 2.6.32-trunk-amd64 #1 SMP Sun Jan 10 22:40:40 UTC
> 2010 x86_64 GNU/Linux
> distro: Debian GNU/Linux squeeze/sid
>
> Unpack the attached tree, cd into it and run:
> git merge-tree common master other
>
> I get the following result:
> added in local
> our 100644 d68dd4031d2ad5b7a3829ad7df6635e27a7daa22 t1.txt
> Segmentation fault
>
> The exit code:
> 139
>
> BR / Klas
Looks like this has been fixed by 21baa6e (merge-tree: fix where two
branches share no changes, 2010-07-14).
$ git merge-tree common master other
added in local
our 100644 d68dd4031d2ad5b7a3829ad7df6635e27a7daa22 t1.txt
$ echo $?
0
$ git --version
git version 1.7.3.2
-Mathias
next prev parent reply other threads:[~2010-10-30 17:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 20:16 git merge-tree segfault Klas Lindberg
2010-10-28 20:25 ` Tim Mazid
2010-10-30 16:27 ` Klas Lindberg
2010-10-30 17:25 ` Ævar Arnfjörð Bjarmason
2010-10-30 17:26 ` Mathias Lafeldt [this message]
2010-10-30 18:11 ` Klas Lindberg
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=4CCC5542.8020105@debugon.org \
--to=misfire@debugon.org \
--cc=git@vger.kernel.org \
--cc=klas.lindberg@gmail.com \
/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.