From: Jeff King <peff@peff.net>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-stash segfaults ...
Date: Tue, 21 Aug 2007 02:05:10 -0400 [thread overview]
Message-ID: <20070821060510.GA7323@coredump.intra.peff.net> (raw)
In-Reply-To: <20070820200255.GD5544@steel.home>
On Mon, Aug 20, 2007 at 10:02:55PM +0200, Alex Riesen wrote:
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 16f6a0f..464fc4e 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1701,6 +1701,8 @@ static struct commit *get_ref(const char *ref)
> if (get_sha1(ref, sha1))
> die("Could not resolve ref '%s'", ref);
> object = deref_tag(parse_object(sha1), ref, strlen(ref));
> + if (!object)
> + die("Could not resolve ref '%s' down to object", ref);
> if (object->type == OBJ_TREE)
> return make_virtual_commit((struct tree*)object,
> better_branch_name(ref));
I posted the exact same patch almost a month ago, but apparently nobody
was interested in applying it:
http://mid.gmane.org/20070726050726.GC32617@coredump.intra.peff.net
-Peff
next prev parent reply other threads:[~2007-08-21 6:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 17:44 git-stash segfaults Pierre Habouzit
2007-08-20 20:02 ` Alex Riesen
2007-08-21 6:05 ` Jeff King [this message]
2007-08-21 6:54 ` Junio C Hamano
2007-08-21 7:08 ` Jeff King
2007-08-20 20:44 ` Junio C Hamano
2007-08-20 20:50 ` Pierre Habouzit
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=20070821060510.GA7323@coredump.intra.peff.net \
--to=peff@peff.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 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).