From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 23 Sep 2007 10:31:23 GMT
Subject: Re: [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions
Message-ID: <8c5c35580709230331h459bd07ay8b17146b5feec212@mail.gmail.com>
In-Reply-To: <7vps0adx0x.fsf@gitster.siamese.dyndns.org>

On 9/23/07, Junio C Hamano <gitster@pobox.com> wrote:
> Lars Hjemli <hjemli@gmail.com> writes:
> > +branch=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
> > +mergeopts=$(git config "branch.$branch.mergeoptions")
> > +parse_config $mergeopts
>
> What should happen when your head is detached?
>

My plan was 'nothing', but I should have tested it (it does work, but
also prints an ugly "fatal: ref HEAD is not a symbolic ref").

-- 
larsh