From: Clemens Buchacher <drizzd@aon.at>
To: git@vger.kernel.org
Cc: Miklos Vajna <vmiklos@frugalware.org>,
Michael Johnson <redbeard@mdjohnson.us>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: Segfault on merge with 1.6.2.1
Date: Sun, 5 Apr 2009 02:46:57 +0200 [thread overview]
Message-ID: <1238892420-721-1-git-send-email-drizzd@aon.at> (raw)
In-Reply-To: <20090401180627.GA14716@localhost>
Hi,
The segmentation fault is caused by a null pointer dereference which happens
during recursive merge with a submodule conflict between two merge bases. This
is fixed by the following patches.
However, there are other problems with merging submodules. For example, git
diff aborts with "fatal: read error 'sub'" for conflicting submodules. I have
also added a test for this.
Dscho has already started working on related issues. I have therefore skipped
t7404, which is already used in Dscho's work.
Clemens
merge-recursive.c | 16 ++-------
t/t7405-submodule-merge.sh | 74 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 12 deletions(-)
[PATCH 1/3] add tests for merging with submodules
[PATCH 2/3] update cache for conflicting submodule entries
[PATCH 3/3] simplify output of conflicting merge
next prev parent reply other threads:[~2009-04-05 0:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 16:19 Segfault on merge with 1.6.2.1 Michael Johnson
2009-03-29 12:17 ` Miklos Vajna
2009-03-30 2:39 ` Michael Johnson
2009-03-30 7:48 ` Johannes Schindelin
2009-03-30 11:03 ` Miklos Vajna
2009-03-31 7:14 ` Michael Johnson
2009-04-01 5:43 ` Michael Johnson
2009-04-01 9:50 ` Miklos Vajna
2009-04-01 18:06 ` Clemens Buchacher
2009-04-02 0:33 ` Michael Johnson
2009-04-05 0:46 ` Clemens Buchacher [this message]
2009-04-05 0:46 ` [PATCH 1/3] add tests for merging with submodules Clemens Buchacher
2009-04-05 0:46 ` [PATCH 2/3] update cache for conflicting submodule entries Clemens Buchacher
2009-04-05 0:47 ` [PATCH 3/3] simplify output of conflicting merge Clemens Buchacher
2009-04-05 9:47 ` Junio C Hamano
2009-04-05 11:50 ` Segfault on merge with 1.6.2.1 Johannes Schindelin
2009-04-06 2:29 ` Michael Johnson
2009-04-06 6:41 ` Clemens Buchacher
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=1238892420-721-1-git-send-email-drizzd@aon.at \
--to=drizzd@aon.at \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=redbeard@mdjohnson.us \
--cc=vmiklos@frugalware.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).