mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
43ae9f47ab
commit
b9f0ac1710
5
cache.h
5
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);
|
||||
|
|
11
ident.c
11
ident.c
|
@ -316,7 +316,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)
|
||||
|
@ -327,13 +326,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!");
|
||||
|
|
Loading…
Reference in a new issue