On Wed, Feb 03, 2016 at 11:19:09PM -0500, Jeff King wrote:
> On Wed, Feb 03, 2016 at 11:01:11PM -0500, Jeff King wrote:
>
> > > + if (ident_explicit) {
> > > + if (name == git_default_name.buf &&
> > > + !(committer_ident_explicitly_given & IDENT_NAME_GIVEN) &&
> > > + !(author_ident_explicitly_given & IDENT_NAME_GIVEN))
> > > + die("requested explicitly given ident in config, "
> > > + "but user.name is not set, or environment is "
> > > + "not set");
> > > + if (email == git_default_email.buf &&
> > > + !(committer_ident_explicitly_given & IDENT_MAIL_GIVEN) &&
> > > + !(author_ident_explicitly_given & IDENT_MAIL_GIVEN))
> > > + die("requested explicitly given ident in config, "
> > > + "but user.email is not set, or environment is "
> > > + "not set");
> > > + }
> > > +
>
> By the way, while reading fmt_ident, I found it to be pretty convoluted,
> and the comparisons to the global strbuf are a bit gross. Maybe this
> should be a good preparatory cleanup?
And then your feature on top would look something like this (taking into
account the points from my previous mail, but leaving the option name
and exact wording of messages up for grabs):
---
diff --git a/ident.c b/ident.c
index f3a431f..d3dc4a9 100644
--- a/ident.c
+++ b/ident.c
@@ -13,11 +13,14 @@ static struct strbuf git_default_date = STRBUF_INIT;
static int default_email_is_bogus;
static int default_name_is_bogus;
+static int ident_explicit;
+
#define IDENT_NAME_GIVEN 01
#define IDENT_MAIL_GIVEN 02
#define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN)
static int committer_ident_explicitly_given;
static int author_ident_explicitly_given;
+static int ident_config_given;
#ifdef NO_GECOS_IN_PWENT
#define get_gecos(ignored) "&"
@@ -354,6 +357,9 @@ const char *fmt_ident(const char *name, const char *email,
fputs(env_hint, stderr);
die("unable to auto-detect name (got '%s')", name);
}
+ if (strict && ident_explicit &&
+ !(ident_config_given & IDENT_NAME_GIVEN))
+ die("user.explicit set but no name given");
}
if (!*name) {
struct passwd *pw;
@@ -373,6 +379,8 @@ const char *fmt_ident(const char *name, const char *email,
fputs(env_hint, stderr);
die("unable to auto-detect email address (got '%s')", email);
}
+ if (strict && ident_explicit && !(ident_config_given & IDENT_MAIL_GIVEN))
+ die("user.explicit set but no mail given");
}
strbuf_reset(&ident);
@@ -446,6 +454,11 @@ int author_ident_sufficiently_given(void)
int git_ident_config(const char *var, const char *value, void *data)
{
+ if (!strcmp(var, "user.explicit")) {
+ ident_explicit = git_config_bool(var, value);
+ return 0;
+ }
+
if (!strcmp(var, "user.name")) {
if (!value)
return config_error_nonbool(var);
@@ -453,6 +466,7 @@ int git_ident_config(const char *var, const char *value, void *data)
strbuf_addstr(&git_default_name, value);
committer_ident_explicitly_given |= IDENT_NAME_GIVEN;
author_ident_explicitly_given |= IDENT_NAME_GIVEN;
+ ident_config_given |= IDENT_NAME_GIVEN;
return 0;
}
@@ -463,6 +477,7 @@ int git_ident_config(const char *var, const char *value, void *data)
strbuf_addstr(&git_default_email, value);
committer_ident_explicitly_given |= IDENT_MAIL_GIVEN;
author_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+ ident_config_given |= IDENT_MAIL_GIVEN;
return 0;
}
And the tests should probably cover a few more cases, including cloning
with the option on, and seeing the impact of $EMAIL (both of which
should work with this, I think).
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html