[PATCH 07/13] fmt_ident: drop IDENT_WARN_ON_NO_NAME code
There are no more callers who want this, so we can drop it.
Signed-off-by: Jeff King <peff@peff.net>
---
cache.h | 5 ++---
ident.c | 11 ++++-------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/cache.h b/cache.h
index f63b71f..65cbab5 100644
--- a/cache.h
+++ b/cache.h
@@ -887,9 +887,8 @@ unsigned long approxidate_careful(const char *, int *);
unsigned long approxidate_relative(const char *date, const struct timeval *now);
enum date_mode parse_date_format(const char *format);
-#define IDENT_WARN_ON_NO_NAME 1
-#define IDENT_ERROR_ON_NO_NAME 2
-#define IDENT_NO_DATE 4
+#define IDENT_ERROR_ON_NO_NAME 1
+#define IDENT_NO_DATE 2
extern const char *git_author_info(int);
extern const char *git_committer_info(int);
extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
diff --git a/ident.c b/ident.c
index af92b2c..d2fa271 100644
--- a/ident.c
+++ b/ident.c
@@ -312,7 +312,6 @@ const char *fmt_ident(const char *name, const char *email,
char date[50];
int i;
int error_on_no_name = (flag & IDENT_ERROR_ON_NO_NAME);
- int warn_on_no_name = (flag & IDENT_WARN_ON_NO_NAME);
int name_addr_only = (flag & IDENT_NO_DATE);
if (!name)
@@ -323,13 +322,11 @@ const char *fmt_ident(const char *name, const char *email,
if (!*name) {
struct passwd *pw;
- if ((warn_on_no_name || error_on_no_name) &&
- name == git_default_name && env_hint) {
- fputs(env_hint, stderr);
- env_hint = NULL; /* warn only once */
- }
- if (error_on_no_name)
+ if (error_on_no_name) {
+ if (name == git_default_name)
+ fputs(env_hint, stderr);
die("empty ident %s <%s> not allowed", name, email);
+ }
pw = getpwuid(getuid());
if (!pw)
die("You don't exist. Go away!");
--
1.7.10.1.16.g53a707b
Jeff King <peff@peff.net>