On 9/23/07, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> "Lars Hjemli" <hjemli@xxxxxxxxx> writes:
>
> > On 9/23/07, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> >> Lars Hjemli <hjemli@xxxxxxxxx> 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
Yes, this is much better (and the ${parameter#word} syntax was nice too).
Thanks.
--
larsh
-
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
