* [PATCH] Fix settings in default_user_config template
@ 2015-04-17 14:50 Ossi Herrala
2015-04-17 14:55 ` Jeff King
0 siblings, 1 reply; 5+ messages in thread
From: Ossi Herrala @ 2015-04-17 14:50 UTC (permalink / raw)
To: git; +Cc: Ossi Herrala
The name (not user) and email setting should be in config section
"user" and not in "core" as documented in Documentation/config.txt.
---
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());
--
2.3.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Fix settings in default_user_config template
2015-04-17 14:50 [PATCH] Fix settings in default_user_config template Ossi Herrala
@ 2015-04-17 14:55 ` Jeff King
2015-04-17 17:08 ` Ossi Herrala
0 siblings, 1 reply; 5+ messages in thread
From: Jeff King @ 2015-04-17 14:55 UTC (permalink / raw)
To: Ossi Herrala; +Cc: git
On Fri, Apr 17, 2015 at 05:50:10PM +0300, Ossi Herrala wrote:
> The name (not user) and email setting should be in config section
> "user" and not in "core" as documented in Documentation/config.txt.
<facepalm> Well, those probably weren't helping any new users, then,
were they? :)
> 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"),
Looks obviously correct. Thanks for noticing.
-Peff
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] Fix settings in default_user_config template
2015-04-17 14:55 ` Jeff King
@ 2015-04-17 17:08 ` Ossi Herrala
2015-04-17 17:08 ` Ossi Herrala
2015-04-17 17:33 ` Junio C Hamano
0 siblings, 2 replies; 5+ messages in thread
From: Ossi Herrala @ 2015-04-17 17:08 UTC (permalink / raw)
To: gitster; +Cc: git, Ossi Herrala
The name (not user) and email setting should be in config section
"user" and not in "core" as documented in Documentation/config.txt.
Signed-Off-By: Ossi Herrala <oherrala@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Fix settings in default_user_config template
2015-04-17 17:08 ` Ossi Herrala
@ 2015-04-17 17:08 ` Ossi Herrala
2015-04-17 17:33 ` Junio C Hamano
1 sibling, 0 replies; 5+ messages in thread
From: Ossi Herrala @ 2015-04-17 17:08 UTC (permalink / raw)
To: gitster; +Cc: git, Ossi Herrala
The name (not user) and email setting should be in config section
"user" and not in "core" as documented in Documentation/config.txt.
---
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());
--
2.3.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Fix settings in default_user_config template
2015-04-17 17:08 ` Ossi Herrala
2015-04-17 17:08 ` Ossi Herrala
@ 2015-04-17 17:33 ` Junio C Hamano
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2015-04-17 17:33 UTC (permalink / raw)
To: Ossi Herrala; +Cc: git
Ossi Herrala <oherrala@gmail.com> writes:
> The name (not user) and email setting should be in config section
> "user" and not in "core" as documented in Documentation/config.txt.
>
> Signed-Off-By: Ossi Herrala <oherrala@gmail.com>
> Reviewed-by: Jeff King <peff@peff.net>
Thanks ;-)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-04-17 18:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-17 14:50 [PATCH] Fix settings in default_user_config template Ossi Herrala
2015-04-17 14:55 ` Jeff King
2015-04-17 17:08 ` Ossi Herrala
2015-04-17 17:08 ` Ossi Herrala
2015-04-17 17:33 ` Junio C Hamano
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).