From: Tim Olsen <tim@brooklynpenguin•com>
To: git@vger•kernel.org
Cc: git@vger•kernel.org, Miklos Vajna <vmiklos@frugalware•org>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re: git-merge segfault in 1.6.6 and master
Date: Thu, 21 Jan 2010 11:37:17 -0500 [thread overview]
Message-ID: <4B5882BD.3090908@brooklynpenguin.com> (raw)
In-Reply-To: <7vtyugzabq.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Tim Olsen <tim@brooklynpenguin•com> writes:
>> Breakpoint 8, write_tree_from_memory (o=0x7fffffffd560) at
>> merge-recursive.c:210
>> (gdb) list
>> 205 struct cache_entry *ce = active_cache[i];
>> 206 if (ce_stage(ce))
>> 207 output(o, 0, "%d %.*s", ce_stage(ce),
>> 208 (int)ce_namelen(ce), ce->name);
>> 209 }
>> 210 return NULL;
>> 211 }
>> 212
>> 213 if (!active_cache_tree)
>> 214 active_cache_tree = cache_tree();
>> (gdb)
>
> Are you saying write_tree_from_memory() is returning NULL? That probably
> means that in the recursive (i.e. the step that first merges multiple
> common ancestors into one) case the merge is getting conflicts. Do you
> see these "There are unmerged index entries" output?
write_tree_from_memory() is returning NULL. Stepping through the
execution in gdb shows it returning NULL at line 210.
I do not see any output, however:
$ git merge origin/deployed
Segmentation fault
$
> In the recursive case (i.e. o->call_depth is non-zero), process_renames()
> and process_entry() are supposed to be forcing the conflicts resolved,
> recording the contents with conflict markers if necessary, before the
> control gets to that point, so it clearly is a bug very specific to the
> recursive merge implementation.
Setting breakpoints on process_renames() and process_entry() shows that
they are being executed. Is there anything I can gather from their
execution that would help you?
Tim
next prev parent reply other threads:[~2010-01-21 16:38 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-20 16:17 git-merge segfault in 1.6.6 and master Tim Olsen
2010-01-20 19:13 ` Junio C Hamano
2010-01-20 21:57 ` Tim Olsen
2010-01-20 22:21 ` Junio C Hamano
2010-01-21 16:37 ` Tim Olsen [this message]
2010-01-21 18:12 ` Junio C Hamano
2010-01-22 0:21 ` Junio C Hamano
2010-01-22 0:38 ` Junio C Hamano
2010-01-21 14:00 ` Miklos Vajna
2010-01-21 21:56 ` Tim Olsen
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=4B5882BD.3090908@brooklynpenguin.com \
--to=tim@brooklynpenguin$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=vmiklos@frugalware$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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