From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/4] config: allow including config from repository blobs
Date: Thu, 26 Jan 2012 18:00:54 -0500 [thread overview]
Message-ID: <20120126230054.GC12855@sigill.intra.peff.net> (raw)
In-Reply-To: <7vbopq2mk9.fsf@alter.siamese.dyndns.org>
On Thu, Jan 26, 2012 at 01:14:46PM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > +You can also include configuration from a blob stored in your repository
> > +by setting the special `include.ref` variable to the name of an object
> > +containing your configuration data (in the same format as a regular
> > +config file).
>
> Hmm, the concept is surely *fun*, but is this really worth it?
> [you could just tell people to copy the file into .git]
Yes, that does work. I liked the idea of putting it in the repo, though,
because it means you can actually _track_ the contents, including any
local changes you make.
So yeah, if you are just going to copy it once, or even periodically, it
is not that big an advantage. And the example I gave using "git tag" did
just that. But I also wanted to allow more complex things, like this:
# clone and inspect
git clone git://example.com/project.git
cd project
git show origin:devtools/std_gitconfig
# well, that looks pretty good. But I'd like to tweak something.
git checkout -b config origin
$EDITOR devtools/std_gitconfig
git commit -a -m "drop the foo option, which I hate"
# OK, let's use it now.
git config include.ref config:devtools/std_gitconfig
# Weeks pass. Somebody else updates the std_gitconfig.
git fetch
# let's inspect the changes
git checkout config
git diff @{u} -- devtools/std_gitconfig
# looks good, let's merge (not copy!) them in
git merge @{u}
This is obviously an advanced thing to be doing. But it's cool to me,
because even if you aren't working on a shared project, it is a means of
versioning your config.
-Peff
next prev parent reply other threads:[~2012-01-26 23:01 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-26 7:35 [RFC/PATCH 0/4] config include directives Jeff King
2012-01-26 7:37 ` [PATCH 1/4] config: add include directive Jeff King
2012-01-26 9:16 ` Johannes Sixt
2012-01-26 16:54 ` Jeff King
2012-01-26 20:42 ` Junio C Hamano
2012-01-26 22:25 ` Jeff King
2012-01-26 22:43 ` Jeff King
2012-01-26 20:58 ` Junio C Hamano
2012-01-26 22:51 ` Jeff King
2012-01-27 5:23 ` Junio C Hamano
2012-01-27 5:55 ` Jeff King
2012-01-27 17:03 ` Jens Lehmann
2012-01-27 0:02 ` Ævar Arnfjörð Bjarmason
2012-01-27 0:32 ` Jeff King
2012-01-27 9:33 ` Ævar Arnfjörð Bjarmason
2012-01-27 5:07 ` Michael Haggerty
2012-01-27 5:54 ` Jeff King
2012-01-26 7:38 ` [PATCH 2/4] config: factor out config file stack management Jeff King
2012-01-26 7:40 ` [PATCH 3/4] config: support parsing config data from buffers Jeff King
2012-01-26 7:42 ` [PATCH 4/4] config: allow including config from repository blobs Jeff King
2012-01-26 9:25 ` Johannes Sixt
2012-01-26 17:22 ` Jeff King
2012-01-27 3:47 ` Nguyen Thai Ngoc Duy
2012-01-27 5:57 ` Jeff King
2012-01-26 21:14 ` Junio C Hamano
2012-01-26 23:00 ` Jeff King [this message]
2012-01-27 0:35 ` Junio C Hamano
2012-01-27 0:49 ` Jeff King
2012-01-27 5:30 ` Junio C Hamano
2012-01-27 5:42 ` Jeff King
2012-01-27 7:27 ` Johannes Sixt
2012-01-27 23:10 ` Junio C Hamano
2012-01-27 4:01 ` Nguyen Thai Ngoc Duy
2012-01-27 5:59 ` Jeff King
2012-01-27 9:51 ` [RFC/PATCH 0/4] config include directives Ævar Arnfjörð Bjarmason
2012-01-27 17:34 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120126230054.GC12855@sigill.intra.peff.net \
--to=peff@peff.net \
--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.
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 NNTP newsgroup(s).