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@xxxxxxxxxxxxxxxxxxxxxxx
-Peff
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
