mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2010-01-17 13:54:28 -08:00
parent 99178c831e
commit 5aeb3a3a83
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-commit.c
View File

@ -624,7 +624,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
author_ident); author_ident);
free(author_ident); free(author_ident);
if (user_ident_explicitly_given != IDENT_ALL_GIVEN) if (!user_ident_sufficiently_given())
fprintf(fp, fprintf(fp,
"%s" "%s"
"# Committer: %s\n", "# Committer: %s\n",

1
cache.h
View File

@ -929,6 +929,7 @@ extern char git_default_name[MAX_GITNAME];
#define IDENT_MAIL_GIVEN 02 #define IDENT_MAIL_GIVEN 02
#define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN) #define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN)
extern int user_ident_explicitly_given; extern int user_ident_explicitly_given;
extern int user_ident_sufficiently_given(void);
extern const char *git_commit_encoding; extern const char *git_commit_encoding;
extern const char *git_log_output_encoding; extern const char *git_log_output_encoding;

9
ident.c
View File

@ -259,3 +259,12 @@ const char *git_committer_info(int flag)
getenv("GIT_COMMITTER_DATE"), getenv("GIT_COMMITTER_DATE"),
flag); 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
}