From: Jeff King <peff@peff.net>
To: Marios Titas <redneb@gmx.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] ident: check for useConfigOnly before auto-detection of name/email
Date: Thu, 31 Mar 2016 10:40:03 -0400 [thread overview]
Message-ID: <20160331144003.GE31116@sigill.intra.peff.net> (raw)
In-Reply-To: <1459366183-15451-1-git-send-email-redneb@gmx.com>
On Wed, Mar 30, 2016 at 10:29:42PM +0300, Marios Titas wrote:
> If user.useConfigOnly is set, it does not make sense to try to
> auto-detect the name and/or the email. So it's better to do the
> useConfigOnly checks first.
It might be nice to explain how it is better here. I'd guess it is
because we may fail during xgetpwuid(), giving a message that is much
less informative?
> @@ -374,14 +374,14 @@ const char *fmt_ident(const char *name, const char *email,
> }
>
> if (!email) {
> + if (strict && ident_use_config_only
> + && !(ident_config_given & IDENT_MAIL_GIVEN))
> + die("user.useConfigOnly set but no mail given");
> email = ident_default_email();
> if (strict && default_email_is_bogus) {
> fputs(env_hint, stderr);
> die("unable to auto-detect email address (got '%s')", email);
> }
> - if (strict && ident_use_config_only
> - && !(ident_config_given & IDENT_MAIL_GIVEN))
> - die("user.useConfigOnly set but no mail given");
> }
I wondered on this hunk whether ident_default_email() could ever set the
IDENT_MAIL_GIVEN flag. It _does_ set it, but only for
"explicitly_given", not for "config_given", which makes sense.
So I think this is doing the right thing.
-Peff
next prev parent reply other threads:[~2016-03-31 14:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 19:29 [PATCH 1/2] ident: check for useConfigOnly before auto-detection of name/email Marios Titas
2016-03-30 19:29 ` [PATCH 2/2] ident: make the useConfigOnly error messages more informative Marios Titas
2016-03-30 22:27 ` Junio C Hamano
2016-03-30 23:25 ` Marios Titas
2016-04-01 22:04 ` Junio C Hamano
2016-04-12 23:19 ` Junio C Hamano
2016-03-31 14:40 ` Jeff King [this message]
2016-03-31 15:01 ` [PATCH 1/2] ident: check for useConfigOnly before auto-detection of name/email Marios Titas
2016-03-31 16:31 ` Jeff King
2016-04-01 22:00 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160331144003.GE31116@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=redneb@gmx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).