From: Klas Lindberg <klas.lindberg@gmail.com>
To: git@vger.kernel.org
Subject: git merge-tree segfault
Date: Thu, 28 Oct 2010 22:16:03 +0200 [thread overview]
Message-ID: <AANLkTinJQCqwRZpbO66VHrgxezedS1Ay3nr9kayiODi9@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
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
[-- Attachment #2: merge-tree_segfault.tar.gz --]
[-- Type: application/x-gzip, Size: 7452 bytes --]
next reply other threads:[~2010-10-28 20:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 20:16 Klas Lindberg [this message]
2010-10-28 20:25 ` git merge-tree segfault 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
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=AANLkTinJQCqwRZpbO66VHrgxezedS1Ay3nr9kayiODi9@mail.gmail.com \
--to=klas.lindberg@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).