threads / patch / 39101

patchFix settings in default_user_config template

Subject: [PATCH] Fix settings in default_user_config template

## tl;dr

5 messages between Apr 17, 2015 and Apr 17, 2015. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Ossi Herrala· Apr 17, 2015, 14:50 UTC · lore

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(-)

Show changes to builtin/config.c +2 −2

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

Jeff King· Apr 17, 2015, 14:55 UTC · re: Ossi Herrala · lore

Re: [PATCH] Fix settings in default_user_config template

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? :)

Show 14 quoted lines

> 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

Ossi Herrala· Apr 17, 2015, 17:08 UTC · re: Jeff King · lore

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>

Ossi Herrala· Apr 17, 2015, 17:08 UTC · re: Ossi Herrala · lore

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(-)

Show changes to builtin/config.c +2 −2

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

Junio C Hamano· Apr 17, 2015, 17:33 UTC · re: Ossi Herrala · lore

Re: [PATCH] Fix settings in default_user_config template

Ossi Herrala <oherrala@gmail.com> writes:

Show 5 quoted lines

> 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 ;-)