From: Clemens Buchacher Date: Sun, 05 Apr 2009 00:46:57 GMT Subject: Re: Segfault on merge with 1.6.2.1 Message-ID: <1238892420-721-1-git-send-email-drizzd@aon.at> 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