Re: [PATCH] commit: match explicit-ident semantics for summary and template
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 17, 2010, 22:03 UTC
- Message-ID
- <7viqb0xubf.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <201001172153.44413.j6t@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
Show 11 quoted lines
> On Sonntag, 17. Januar 2010, Jeff King wrote:
>> - if (!user_ident_explicitly_given) {
>> + if (user_ident_explicitly_given != IDENT_ALL_GIVEN) {
>> strbuf_addstr(&format, "\n Committer: ");
>
> Sorry for chiming in so late, but this new condition worries me a bit. On all
> of my machines I have the GECOS field filled in with "Johannes Sixt", i.e., I
> do not need user.name. But of course the automatically derived email address
> is nonsense, so I've set up only user.email. Now I would always this hint,
> wouldn't I? Do most others fill in GECOS in ways that are inappropriate for
> git?We could say something like
if (!(user_ident_explicitly_given & IDENT_EMAIL_GIVEN))
and it probably is a safer change on platforms with GECOS available, but then wouldn't msysgit folks have to fork this code?
Below are _two_ overlapping patches that apply on top of individual topics; they will conflict when the topics are merged but hopefully in a way that is trivially understandable, and I think can supersede Jeff's patch.
-- >8 -- to jc/ident topic -- >8 --
builtin-commit.c | 2 +- cache.h | 1 + ident.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/builtin-commit.c b/builtin-commit.c index f4974b5..b76f327 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -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", diff --git a/cache.h b/cache.h index 16c8e8d..f7a287c 100644 --- a/cache.h +++ b/cache.h @@ -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; diff --git a/ident.c b/ident.c index d4f6145..96b56e6 100644 --- a/ident.c +++ b/ident.c @@ -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 +} -- 8< -- to jc/ident topic -- 8< -- -- >8 -- to jk/warn-author-committer-after-commit topic -- >8 -- builtin-commit.c | 4 ++-- cache.h | 1 + ident.c | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/builtin-commit.c b/builtin-commit.c index 7f61e87..29dc3df 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -602,7 +602,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, author_ident); free(author_ident); - if (!user_ident_explicitly_given) + if (!user_ident_sufficiently_given()) fprintf(fp, "%s" "# Committer: %s\n", @@ -991,7 +991,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1) strbuf_addstr(&format, "\n Author: "); strbuf_addbuf_percentquote(&format, &author_ident); } - if (!user_ident_explicitly_given) { + if (!user_ident_sufficiently_given()) { strbuf_addstr(&format, "\n Committer: "); strbuf_addbuf_percentquote(&format, &committer_ident); if (advice_implicit_identity) { diff --git a/cache.h b/cache.h index bf468e5..63e0701 100644 --- a/cache.h +++ b/cache.h @@ -926,6 +926,7 @@ extern const char *config_exclusive_filename; extern char git_default_email[MAX_GITNAME]; extern char git_default_name[MAX_GITNAME]; 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; diff --git a/ident.c b/ident.c index 26409b2..248f769 100644 --- a/ident.c +++ b/ident.c @@ -259,3 +259,8 @@ const char *git_committer_info(int flag) getenv("GIT_COMMITTER_DATE"), flag); } + +int user_ident_sufficiently_given(void) +{ + return user_ident_explicitly_given; +} -- 8< -- to jk/warn-author-committer-after-commit topic -- 8< --