From: "Lars Hjemli" <hjemli@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions
Date: Sun, 23 Sep 2007 21:33:15 +0200 [thread overview]
Message-ID: <8c5c35580709231233k1e24e36ayf294483d67096058@mail.gmail.com> (raw)
In-Reply-To: <7vr6kpchny.fsf@gitster.siamese.dyndns.org>
On 9/23/07, Junio C Hamano <gitster@pobox.com> wrote:
> "Lars Hjemli" <hjemli@gmail.com> writes:
>
> > 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
Yes, this is much better (and the ${parameter#word} syntax was nice too).
Thanks.
--
larsh
next prev parent reply other threads:[~2007-09-23 19:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-22 0:33 [PATCH 0/5] per branch options for git-merge incl. --no-ff Lars Hjemli
2007-09-22 0:33 ` [PATCH 1/5] Add test-script for git-merge porcelain Lars Hjemli
2007-09-22 0:33 ` [PATCH 2/5] git-merge: refactor option parsing Lars Hjemli
2007-09-22 0:33 ` [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions Lars Hjemli
2007-09-22 0:33 ` [PATCH 4/5] git-merge: add support for --commit Lars Hjemli
2007-09-22 0:33 ` [PATCH 5/5] git-merge: add --ff and --no-ff options Lars Hjemli
2007-09-23 0:51 ` [PATCH 4/5] git-merge: add support for --commit Junio C Hamano
2007-09-23 10:35 ` Lars Hjemli
2007-09-23 0:51 ` [PATCH 3/5] git-merge: add support for branch.<name>.mergeoptions Junio C Hamano
2007-09-23 10:31 ` Lars Hjemli
2007-09-23 19:20 ` Junio C Hamano
2007-09-23 19:33 ` Lars Hjemli [this message]
2007-09-23 0:51 ` [PATCH 1/5] Add test-script for git-merge porcelain Junio C Hamano
2007-09-23 10:24 ` Lars Hjemli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8c5c35580709231233k1e24e36ayf294483d67096058@mail.gmail.com \
--to=hjemli@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).