Re: [PATCH] checkout: tone down the "forked status" diagnostic messages
- From
Jay Soffian <jaysoffian@gmail.com>
- Date
- Feb 21, 2008, 02:56 UTC
- Message-ID
- <76718490802201856x54f160e7m7bb6ba10fada845e@mail.gmail.com>
- In-Reply-To
- <7vy79f2pqk.fsf_-_@gitster.siamese.dyndns.org>
On Wed, Feb 20, 2008 at 6:05 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> diff --git a/builtin-checkout.c b/builtin-checkout.c > index 5291f72..261f67f 100644 > --- a/builtin-checkout.c > +++ b/builtin-checkout.c > @@ -301,64 +301,88 @@ static void adjust_to_tracking(struct branch_info *new, struct checkout_opts *op > char *base; > + base = branch->merge[0]->dst; > if (!resolve_ref(base, sha1, 1, NULL)) > return;
Apparently base can be null, which on OS X causes a Bus Error in resolve_ref when it calls strcmp(ref, list->name)
j.