undef/git-commit-vandalism
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:59:36 -08:00
parent fc6f19fe2b
commit 1a893064d7
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-commit.c
View File

@ -602,7 +602,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) if (!user_ident_sufficiently_given())
fprintf(fp, fprintf(fp,
"%s" "%s"
"# Committer: %s\n", "# Committer: %s\n",
@ -991,7 +991,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
strbuf_addstr(&format, "\n Author: "); strbuf_addstr(&format, "\n Author: ");
strbuf_addbuf_percentquote(&format, &author_ident); strbuf_addbuf_percentquote(&format, &author_ident);
} }
if (!user_ident_explicitly_given) { if (!user_ident_sufficiently_given()) {
strbuf_addstr(&format, "\n Committer: "); strbuf_addstr(&format, "\n Committer: ");
strbuf_addbuf_percentquote(&format, &committer_ident); strbuf_addbuf_percentquote(&format, &committer_ident);
if (advice_implicit_identity) { if (advice_implicit_identity) {

1
cache.h
View File

@ -926,6 +926,7 @@ extern const char *config_exclusive_filename;
extern char git_default_email[MAX_GITNAME]; extern char git_default_email[MAX_GITNAME];
extern char git_default_name[MAX_GITNAME]; extern char git_default_name[MAX_GITNAME];
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;

5
ident.c
View File

@ -259,3 +259,8 @@ const char *git_committer_info(int flag)
getenv("GIT_COMMITTER_DATE"), getenv("GIT_COMMITTER_DATE"),
flag); flag);
} }
int user_ident_sufficiently_given(void)
{
return user_ident_explicitly_given;
}