From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [RFC PATCH 1/3] config --global --edit: create a template file if needed
Date: Fri, 25 Jul 2014 19:52:35 +0200 [thread overview]
Message-ID: <vpq61il9vh8.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqioml732e.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Fri, 25 Jul 2014 10:36:57 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> Probably a good idea; I do not think of any possible interactions we
> have to worry about with the configuration file init-db creates with
> possible templating.
The feature should trigger only for --global, so it shouldn't interfer
with .git/config and templates.
> Do we use "user-wide" as a phrase to refer to these? It sounds
> somewhat funny to call anything specific to $frotz "$frotz-wide", at
> least to me.
>
> Surely, /etc/gitconfig is called "site-wide". But .git/config is
> per-project (or project-specific), and I would always have thought
> that ~/.gitconfig was "per-user".
I'm not a native speaker, but to me, "user-wide" insists on the fact
that it applies to everything for this user, and "per-user" insists on
the fact that it does not apply to other users.
Perhaps just "Git's user configuration file" would be enough.
>> builtin/config.c | 30 +++++++++++++++++++++++++++---
>> cache.h | 1 +
>> ident.c | 2 +-
>> 3 files changed, 29 insertions(+), 4 deletions(-)
>>
>> diff --git a/builtin/config.c b/builtin/config.c
>> index fcd8474..3821697 100644
>> --- a/builtin/config.c
>> +++ b/builtin/config.c
>> @@ -445,6 +445,20 @@ static int get_urlmatch(const char *var, const char *url)
>> return 0;
>> }
>>
>> +static char *default_user_config()
>
> static char *default_user_config(void)
Right. Doing too much C++.
>> +{
>> + struct strbuf buf = STRBUF_INIT;
>> + strbuf_addf(&buf,
>> + _("# This is Git's user-wide configuration file.\n"
>> + "[core]\n"
>> + "# Please, adapt and uncomment the following lines:\n"
>
> tangent: is it a French tradition to always have comma after please?
Perhaps. In French, the comma would be required after "S'il vous plait"
(litterally, "if you like"). I'll remove it.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
prev parent reply other threads:[~2014-07-25 17:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 13:44 [RFC PATCH 1/3] config --global --edit: create a template file if needed Matthieu Moy
2014-07-25 13:44 ` [RFC PATCH 2/3] home_config_path: allow NULL xdg parameter Matthieu Moy
2014-07-25 13:57 ` Tanay Abhra
2014-07-25 18:06 ` Junio C Hamano
2014-07-25 18:16 ` Matthieu Moy
2014-07-25 13:44 ` [RFC PATCH 3/3] commit: advertize config --global --edit on guessed identity Matthieu Moy
2014-07-25 15:40 ` Eric Sunshine
2014-07-25 15:37 ` [RFC PATCH 1/3] config --global --edit: create a template file if needed Eric Sunshine
2014-07-25 16:01 ` Matthieu Moy
2014-07-25 17:51 ` Eric Sunshine
2014-07-25 17:59 ` Junio C Hamano
2014-07-25 17:36 ` Junio C Hamano
2014-07-25 17:52 ` Matthieu Moy [this message]
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=vpq61il9vh8.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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