From: Felipe Contreras <felipe.contreras@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Thomas Rast <trast@student.ethz.ch>,
Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCHv2 8/8] send-email: do not prompt for explicit repo ident
Date: Thu, 15 Nov 2012 03:08:42 +0100 [thread overview]
Message-ID: <CAMP44s0d+g7bXCnOf55jZNNFS6uJ+4BDowx5uYxWBP4xA+-0zA@mail.gmail.com> (raw)
In-Reply-To: <20121115003640.GH17819@sigill.intra.peff.net>
On Thu, Nov 15, 2012 at 1:36 AM, Jeff King <peff@peff.net> wrote:
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 5a7c29d..0c49b32 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -436,9 +436,8 @@ if (0) {
> }
> }
>
> -my ($repoauthor, $repocommitter);
> -($repoauthor) = Git::ident_person(@repo, 'author');
> -($repocommitter) = Git::ident_person(@repo, 'committer');
> +my ($repoauthor, $author_explicit) = Git::ident_person(@repo, 'author');
> +my ($repocommitter, $committer_explicit) = Git::ident_person(@repo, 'committer');
>
> # Verify the user input
>
> @@ -755,12 +754,17 @@ if (!$force) {
>
> my $prompting = 0;
> if (!defined $sender) {
> - $sender = $repoauthor || $repocommitter || '';
> - $sender = ask("Who should the emails appear to be from? [$sender] ",
> - default => $sender,
> - valid_re => qr/\@.*\./, confirm_only => 1);
> - print "Emails will be sent from: ", $sender, "\n";
> - $prompting++;
> + ($sender, my $explicit) =
> + defined $repoauthor ? ($repoauthor, $author_explicit) :
> + defined $repocommitter ? ($repocommitter, $committer_explicit) :
> + ('', 0);
> + if (!$explicit) {
> + $sender = ask("Who should the emails appear to be from? [$sender] ",
> + default => $sender,
> + valid_re => qr/\@.*\./, confirm_only => 1);
> + print "Emails will be sent from: ", $sender, "\n";
> + $prompting++;
> + }
> }
>
> if (!@initial_to && !defined $to_cmd) {
I don't think there's any need for all that, this does the trick:
diff --git a/git-send-email.perl b/git-send-email.perl
index aea66a0..503e551 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -748,16 +748,11 @@ if (!$force) {
}
}
-my $prompting = 0;
if (!defined $sender) {
$sender = $repoauthor || $repocommitter || '';
- $sender = ask("Who should the emails appear to be from? [$sender] ",
- default => $sender,
- valid_re => qr/\@.*\./, confirm_only => 1);
- print "Emails will be sent from: ", $sender, "\n";
- $prompting++;
}
+my $prompting = 0;
This passes all the current tests and the ones you added.
Which kind of user will get the prompt with your patch, that would
miss it with mine?
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2012-11-15 2:08 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-11 17:06 [PATCH] send-email: add proper default sender Felipe Contreras
2012-11-11 17:12 ` Ramkumar Ramachandra
2012-11-11 18:06 ` Felipe Contreras
2012-11-12 23:35 ` Jeff King
2012-11-12 23:42 ` Felipe Contreras
2012-11-13 0:02 ` Jeff King
2012-11-13 0:06 ` Jeff King
2012-11-13 0:55 ` Junio C Hamano
2012-11-13 0:54 ` Felipe Contreras
2012-11-13 3:27 ` Jeff King
2012-11-13 3:40 ` Jeff King
2012-11-13 3:55 ` Felipe Contreras
2012-11-13 4:01 ` Jeff King
2012-11-13 6:42 ` Felipe Contreras
2012-11-13 7:18 ` Felipe Contreras
2012-11-13 7:47 ` Jeff King
2012-11-13 9:06 ` Felipe Contreras
2012-11-13 16:48 ` Jeff King
2012-11-13 16:49 ` [PATCH 1/6] ident: make user_ident_explicitly_given private Jeff King
2012-11-14 16:44 ` Jonathan Nieder
2012-11-14 19:11 ` Jeff King
2012-11-13 16:52 ` [PATCH 2/6] ident: keep separate "explicit" flags for author and committer Jeff King
2012-11-13 16:52 ` [PATCH 3/6] var: accept multiple variables on the command line Jeff King
2012-11-14 17:01 ` Jonathan Nieder
2012-11-14 19:26 ` Jeff King
2012-11-13 16:53 ` [PATCH 4/6] var: provide explicit/implicit ident information Jeff King
2012-11-14 17:06 ` Jonathan Nieder
2012-11-14 19:53 ` Jeff King
2012-11-13 16:53 ` [PATCH 5/6] Git.pm: teach "ident" to query explicitness Jeff King
[not found] ` <20121113172300.GA16241@ftbfs.org>
2012-11-13 17:25 ` Jeff King
2012-11-14 17:12 ` Jonathan Nieder
2012-11-14 19:54 ` Jeff King
2012-11-13 16:53 ` [PATCH 6/6] send-email: do not prompt for explicit repo ident Jeff King
2012-11-14 17:18 ` Jonathan Nieder
2012-11-14 20:05 ` Jeff King
2012-11-14 20:26 ` Jeff King
2012-11-13 20:35 ` [PATCH] send-email: add proper default sender Felipe Contreras
2012-11-15 0:07 ` Jeff King
2012-11-15 1:41 ` Felipe Contreras
2012-11-15 1:50 ` Jeff King
2012-11-15 2:14 ` Felipe Contreras
2012-11-15 0:30 ` [PATCHv2 0/8] loosening "sender" prompt in send-email Jeff King
2012-11-15 0:33 ` [PATCHv2 1/8] test-lib: allow negation of prerequisites Jeff King
2012-11-15 7:46 ` Jonathan Nieder
2012-11-15 16:42 ` Jeff King
2012-11-15 16:49 ` Jonathan Nieder
2012-11-15 0:33 ` [PATCHv2 2/8] t7502: factor out autoident prerequisite Jeff King
2012-11-15 7:49 ` Jonathan Nieder
2012-11-15 0:34 ` [PATCHv2 3/8] ident: make user_ident_explicitly_given static Jeff King
2012-11-15 7:51 ` Jonathan Nieder
2012-11-15 0:34 ` [PATCHv2 4/8] ident: keep separate "explicit" flags for author and committer Jeff King
2012-11-15 8:04 ` Jonathan Nieder
2012-11-15 0:35 ` [PATCHv2 5/8] var: accept multiple variables on the command line Jeff King
2012-11-15 8:10 ` Jonathan Nieder
2012-11-15 0:35 ` [PATCHv2 6/8] var: provide explicit/implicit ident information Jeff King
2012-11-15 0:36 ` [PATCHv2 7/8] Git.pm: teach "ident" to query explicitness Jeff King
2012-11-15 8:13 ` Jonathan Nieder
2012-11-15 0:36 ` [PATCHv2 8/8] send-email: do not prompt for explicit repo ident Jeff King
2012-11-15 2:08 ` Felipe Contreras [this message]
2012-11-15 8:33 ` Jeff King
2012-11-15 10:28 ` Felipe Contreras
2012-11-15 10:43 ` Jeff King
2012-11-15 11:13 ` Jeff King
2012-11-15 11:50 ` Jeff King
2012-11-15 16:56 ` Junio C Hamano
2012-11-15 17:28 ` Jeff King
2012-11-16 5:17 ` Junio C Hamano
2012-11-16 19:08 ` Jeff King
2012-11-16 19:57 ` Felipe Contreras
2012-11-16 20:11 ` Jeff King
2012-11-16 20:04 ` Junio C Hamano
2012-11-15 8:23 ` Jonathan Nieder
2012-11-13 16:13 ` [PATCH] send-email: add proper default sender Junio C Hamano
2012-11-13 17:14 ` Jeff King
2012-11-13 17:23 ` Junio C Hamano
2012-11-13 17:20 ` Erik Faye-Lund
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=CAMP44s0d+g7bXCnOf55jZNNFS6uJ+4BDowx5uYxWBP4xA+-0zA@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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).