Re: [PATCH] Fix settings in default_user_config template

2015-04-17 Thread Jeff King
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
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] Fix settings in default_user_config template

2015-04-17 Thread 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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] Fix settings in default_user_config template

2015-04-17 Thread 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 oherr...@gmail.com
Reviewed-by: Jeff King p...@peff.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] Fix settings in default_user_config template

2015-04-17 Thread 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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] Fix settings in default_user_config template

2015-04-17 Thread Junio C Hamano
Ossi Herrala oherr...@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 oherr...@gmail.com
 Reviewed-by: Jeff King p...@peff.net

Thanks ;-)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html