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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
May 21, 2012 at 19:10 UTC
b9f0ac1710ed1d2dc865ab40893720e9a242e362
2 files changed
+6
-10
cache.h
+2
-3
@@ -887,9 +887,8 @@ unsigned long approxidate_careful(const char *, int *);
887
unsigned long approxidate_relative(const char *date, const struct timeval *now);
888
enum date_mode parse_date_format(const char *format);
889
890
-#define IDENT_WARN_ON_NO_NAME 1
891
-#define IDENT_ERROR_ON_NO_NAME 2
892
-#define IDENT_NO_DATE 4
890
+#define IDENT_ERROR_ON_NO_NAME 1
891
+#define IDENT_NO_DATE 2
892
extern const char *git_author_info(int);
893
extern const char *git_committer_info(int);
894
extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
ident.c
+4
-7
@@ -316,7 +316,6 @@ const char *fmt_ident(const char *name, const char *email,
316
char date[50];
317
int i;
318
int error_on_no_name = (flag & IDENT_ERROR_ON_NO_NAME);
319
- int warn_on_no_name = (flag & IDENT_WARN_ON_NO_NAME);
319
int name_addr_only = (flag & IDENT_NO_DATE);
320
321
if (!name)
@@ -327,13 +326,11 @@ const char *fmt_ident(const char *name, const char *email,
326
if (!*name) {
327
struct passwd *pw;
328
330
- if ((warn_on_no_name || error_on_no_name) &&
331
- name == git_default_name && env_hint) {
332
- fputs(env_hint, stderr);
333
- env_hint = NULL; /* warn only once */
334
- }
335
- if (error_on_no_name)
329
+ if (error_on_no_name) {
330
+ if (name == git_default_name)
331
+ fputs(env_hint, stderr);
332
die("empty ident %s <%s> not allowed", name, email);
333
+ }
334
pw = getpwuid(getuid());
335
if (!pw)
336
die("You don't exist. Go away!");