summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorMarios Titas <redneb@gmx.com>2016-03-30 22:29:43 +0300
committerJunio C Hamano <gitster@pobox.com>2016-04-01 15:01:20 -0700
commitd3c06c196964c02f7343b53301e0e85679fad51f (patch)
tree8cea524ea19633b0fc59206ec7f65dbb145acd5c /ident.c
parent734c7789aa1055d465e336f618889cc6df478535 (diff)
downloadgit-d3c06c196964c02f7343b53301e0e85679fad51f.tar.gz
ident: give "please tell me" message upon useConfigOnly errorda/user-useconfigonly
The env_hint message applies perfectly to the case when user.useConfigOnly is set and at least one of the user.name and the user.email are not provided. Additionally, use a less descriptive error message to discourage users from disabling user.useConfigOnly configuration variable to work around this error condition. We want to encourage them to set user.name or user.email instead. Signed-off-by: Marios Titas <redneb@gmx.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ident.c')
-rw-r--r--ident.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/ident.c b/ident.c
index b2521ffc01..c766127d75 100644
--- a/ident.c
+++ b/ident.c
@@ -352,8 +352,10 @@ const char *fmt_ident(const char *name, const char *email,
int using_default = 0;
if (!name) {
if (strict && ident_use_config_only
- && !(ident_config_given & IDENT_NAME_GIVEN))
- die("user.useConfigOnly set but no name given");
+ && !(ident_config_given & IDENT_NAME_GIVEN)) {
+ fputs(env_hint, stderr);
+ die("no name was given and auto-detection is disabled");
+ }
name = ident_default_name();
using_default = 1;
if (strict && default_name_is_bogus) {
@@ -375,8 +377,10 @@ const char *fmt_ident(const char *name, const char *email,
if (!email) {
if (strict && ident_use_config_only
- && !(ident_config_given & IDENT_MAIL_GIVEN))
- die("user.useConfigOnly set but no mail given");
+ && !(ident_config_given & IDENT_MAIL_GIVEN)) {
+ fputs(env_hint, stderr);
+ die("no email was given and auto-detection is disabled");
+ }
email = ident_default_email();
if (strict && default_email_is_bogus) {
fputs(env_hint, stderr);