From: Junio C Hamano <gitster@pobox.com>
To: Pete Harlan <pchpublic88@gmail.com>
Cc: git@vger.kernel.org, Matthieu.Moy@imag.fr
Subject: Re: [PATCH] config --global --edit: generate correct .gitconfig template
Date: Wed, 06 May 2015 10:56:31 -0700 [thread overview]
Message-ID: <xmqqzj5htws0.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1430934077-20724-1-git-send-email-pchpublic88@gmail.com> (Pete Harlan's message of "Wed, 6 May 2015 10:41:17 -0700")
Pete Harlan <pchpublic88@gmail.com> writes:
> When the user asks to edit an empty .gitconfig file, we learned to
> generate a default version in 9830534e (config --global --edit: create
> a template file if needed, 2014-07-25), but the generated config
> mistakenly set core.user and core.email instead of user.name and
> user.email. Fix this.
>
> Signed-off-by: Pete Harlan <pchpublic88@gmail.com>
> ---
Thanks, I think this was already done in 7e110524 (config: fix
settings in default_user_config template, 2015-04-17).
>
> I ran up against this yesterday and it is easy enough to fix, but I
> don't have time right now to write tests for it.
>
> builtin/config.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/config.c b/builtin/config.c
> index d32c532..bfd3016 100644
> --- a/builtin/config.c
> +++ b/builtin/config.c
> @@ -455,9 +455,9 @@ static char *default_user_config(void)
> struct strbuf buf = STRBUF_INIT;
> strbuf_addf(&buf,
> _("# This is Git's per-user configuration file.\n"
> - "[core]\n"
> + "[user]\n"
> "# Please adapt and uncomment the following lines:\n"
> - "# user = %s\n"
> + "# name = %s\n"
> "# email = %s\n"),
> ident_default_name(),
> ident_default_email());
next prev parent reply other threads:[~2015-05-06 17:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-06 17:41 [PATCH] config --global --edit: generate correct .gitconfig template Pete Harlan
2015-05-06 17:56 ` Junio C Hamano [this message]
2015-05-06 18:10 ` Pete Harlan
2015-05-07 18:41 ` Junio C Hamano
2015-05-07 8:45 ` Matthieu Moy
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=xmqqzj5htws0.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=pchpublic88@gmail.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