Re: [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 23, 2007, 19:20 UTC
Message-ID: <7vr6kpchny.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <8c5c35580709230331h459bd07ay8b17146b5feec212@mail.gmail.com>

"Lars Hjemli" <hjemli@gmail.com> writes:

Show 11 quoted lines

> 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").

That, and also running "git config branch..mergeoptions" and expect it does not change behaviour to issue more strict warning, are both not so good. Perhaps the code needs to be more defensive like:

    if branch=$(git symbolic-ref -q HEAD)
    then
        mergeopts=$(git config "branch.${branch#refs/heads/}.mergeoptions")
	if test -n "$mergeopts"
        then
	    parse_config $mergeopts
	fi
    fi