Commit 5aeb3a3a authored by Junio C Hamano's avatar Junio C Hamano

user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 99178c83
......@@ -624,7 +624,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
author_ident);
free(author_ident);
if (user_ident_explicitly_given != IDENT_ALL_GIVEN)
if (!user_ident_sufficiently_given())
fprintf(fp,
"%s"
"# Committer: %s\n",
......
......@@ -929,6 +929,7 @@ extern char git_default_name[MAX_GITNAME];
#define IDENT_MAIL_GIVEN 02
#define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN)
extern int user_ident_explicitly_given;
extern int user_ident_sufficiently_given(void);
extern const char *git_commit_encoding;
extern const char *git_log_output_encoding;
......
......@@ -259,3 +259,12 @@ const char *git_committer_info(int flag)
getenv("GIT_COMMITTER_DATE"),
flag);
}
int user_ident_sufficiently_given(void)
{
#ifndef WINDOWS
return (user_ident_explicitly_given & IDENT_MAIL_GIVEN);
#else
return (user_ident_explicitly_given == IDENT_ALL_GIVEN);
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment