From: Tom Prince <tom.prince@ualberta.net>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: SEGV in git-merge recursive:
Date: Thu, 29 Mar 2007 12:32:19 +0400 [thread overview]
Message-ID: <20070329083219.GA6421@hermes> (raw)
In-Reply-To: <81b0412b0703290118q3e602a7bx650ac41241855546@mail.gmail.com>
On Thu, Mar 29, 2007 at 10:18:14AM +0200, Alex Riesen wrote:
> On 3/29/07, Tom Prince <tom.prince@ualberta.net> wrote:
> >I have been keeping my Maildir in git, a non-trivial merge that causes a
> >segfault in git-merge-recursive.
>
> Can you try and get a stack trace? Do, for example, GIT_TRACE=1 git merge
> ...
> ... find the call to git-merge-recursive and start that in gdb.
> Wait until it crash.
Here is the backtrace.
#0 0x0000000000402d29 in sha_eq (a=0xfefefefefefefeff <Address 0xfefefefefefefeff out of bounds>,
b=0x563cdc "�6Cq�\234�w:0T��\177�\023p\214Q,") at cache.h:259
#1 0x000000000040456e in merge (h1=0x553ca0, h2=0x553d20, branch1=0x7fff92e5c27b "HEAD",
branch2=0x7fff92e5c3ee "merge", ca=0x5528a0, result=0x7fff92e5ab90) at merge-recursive.c:1115
#2 0x0000000000405d89 in main (argc=-1830435858, argv=0x8) at merge-recursive.c:1362
I actually got this backtrace with the following script in git-merge-gdb
#!/bin/zsh
exec gdb -x =(print run $@) =git-merge-recursive
next prev parent reply other threads:[~2007-03-29 8:32 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-29 7:50 SEGV in git-merge recursive: Tom Prince
2007-03-29 8:18 ` Alex Riesen
2007-03-29 8:32 ` Tom Prince [this message]
2007-03-29 11:29 ` Alex Riesen
2007-03-29 12:58 ` Tom Prince
2007-03-29 13:34 ` Alex Riesen
2007-03-29 14:12 ` Tom Prince
2007-03-29 14:44 ` Alex Riesen
2007-03-29 14:45 ` Alex Riesen
2007-03-29 15:04 ` Tom Prince
2007-03-29 15:04 ` Alex Riesen
2007-03-29 18:32 ` Alex Riesen
2007-03-29 18:55 ` Alex Riesen
2007-03-29 23:01 ` [PATCH] An attempt to resolve a rename/rename conflict in recursive merge Alex Riesen
2007-03-29 23:13 ` Alex Riesen
2007-03-29 19:34 ` SEGV in git-merge recursive: Linus Torvalds
2007-03-29 19:40 ` Linus Torvalds
2007-03-29 20:44 ` Alex Riesen
2007-03-30 21:00 ` Johannes Schindelin
2007-03-31 0:35 ` Linus Torvalds
2007-03-31 1:03 ` Linus Torvalds
2007-03-31 10:49 ` Alex Riesen
2007-03-31 11:49 ` [PATCH] Keep rename/rename conflicts of intermediate merges while doing recursive merge Alex Riesen
2007-03-31 12:06 ` Jakub Narebski
2007-03-31 12:50 ` Johannes Schindelin
2007-03-31 12:53 ` Johannes Schindelin
2007-03-31 16:07 ` Linus Torvalds
2007-03-31 17:34 ` Alex Riesen
2007-03-31 20:03 ` Junio C Hamano
2007-03-31 11:22 ` SEGV in git-merge recursive: Johannes Schindelin
2007-03-29 19:55 ` Tom Prince
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=20070329083219.GA6421@hermes \
--to=tom.prince@ualberta.net \
--cc=git@vger.kernel.org \
--cc=raa.lkml@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.