undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmt_ident: drop IDENT_WARN_ON_NO_NAME code

Browse Source 
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>
This commit is contained in:
Jeff King 2012-05-21 19:10:11 -04:00 committed by Junio C Hamano
parent 43ae9f47ab
commit b9f0ac1710
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cache.h
View File

@ -887,9 +887,8 @@ unsigned long approxidate_careful(const char *, int *);
unsigned long approxidate_relative(const char *date, const struct timeval *now); unsigned long approxidate_relative(const char *date, const struct timeval *now);
enum date_mode parse_date_format(const char *format); enum date_mode parse_date_format(const char *format);
#define IDENT_WARN_ON_NO_NAME 1 #define IDENT_ERROR_ON_NO_NAME 1
#define IDENT_ERROR_ON_NO_NAME 2 #define IDENT_NO_DATE 2
#define IDENT_NO_DATE 4
extern const char *git_author_info(int); extern const char *git_author_info(int);
extern const char *git_committer_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); extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);

11
ident.c
View File

@ -316,7 +316,6 @@ const char *fmt_ident(const char *name, const char *email,
char date[50]; char date[50];
int i; int i;
int error_on_no_name = (flag & IDENT_ERROR_ON_NO_NAME); 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); int name_addr_only = (flag & IDENT_NO_DATE);
if (!name) if (!name)
@ -327,13 +326,11 @@ const char *fmt_ident(const char *name, const char *email,
if (!*name) { if (!*name) {
struct passwd *pw; struct passwd *pw;
if ((warn_on_no_name || error_on_no_name) && if (error_on_no_name) {
name == git_default_name && env_hint) { if (name == git_default_name)
fputs(env_hint, stderr); fputs(env_hint, stderr);
env_hint = NULL; /* warn only once */
}
if (error_on_no_name)
die("empty ident %s <%s> not allowed", name, email); die("empty ident %s <%s> not allowed", name, email);
}
pw = getpwuid(getuid()); pw = getpwuid(getuid());
if (!pw) if (!pw)
die("You don't exist. Go away!"); die("You don't exist. Go away!");