From: Dmitry Safonov <dima@arista.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Dmitry Safonov" <0x7f454c46@gmail.com>,
"Dmitry Safonov" <dima@arista.com>,
"Andrei Vagin" <avagin@openvz.org>
Subject: [PATCH] send-email: Ask if a patch should be sent twice
Date: Tue, 30 Jul 2019 01:13:52 +0100 [thread overview]
Message-ID: <20190730001352.7477-1-dima@arista.com> (raw)
I was almost certain that git won't let me send the same patch twice,
but today I've managed to double-send a directory by a mistake:
git send-email --to linux-kernel@vger.kernel.org /tmp/timens/
--cc 'Dmitry Safonov <0x7f454c46@gmail.com>' /tmp/timens/`
[I haven't noticed that I put the directory twice ^^]
Prevent this shipwreck from happening again by asking if a patch
is sent multiple times on purpose.
link: https://lkml.kernel.org/r/4d53ebc7-d5b2-346e-c383-606401d19d3a@gmail.com
Cc: Andrei Vagin <avagin@openvz.org>
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
git-send-email.perl | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 5f92c89c1c1b..0caafc104478 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -33,6 +33,7 @@
use Net::Domain ();
use Net::SMTP ();
use Git::LoadCPAN::Mail::Address;
+use experimental 'smartmatch';
Getopt::Long::Configure qw/ pass_through /;
@@ -658,6 +659,17 @@ sub is_format_patch_arg {
}
}
+sub send_file_twice {
+ my $f = shift;
+ $_ = ask(__("Patch $f will be sent twice, continue? [y]/n "),
+ default => "y",
+ valid_re => qr/^(?:yes|y|no|n)/i);
+ if (/^n/i) {
+ cleanup_compose_files();
+ exit(0);
+ }
+}
+
# Now that all the defaults are set, process the rest of the command line
# arguments and collect up the files that need to be processed.
my @rev_list_opts;
@@ -669,10 +681,19 @@ sub is_format_patch_arg {
opendir my $dh, $f
or die sprintf(__("Failed to opendir %s: %s"), $f, $!);
- push @files, grep { -f $_ } map { catfile($f, $_) }
+ my @new_files = grep { -f $_ } map { catfile($f, $_) }
sort readdir $dh;
+ foreach my $nfile (@new_files) {
+ if ($nfile ~~ @files) {
+ send_file_twice($nfile);
+ }
+ }
+ push @files, @new_files;
closedir $dh;
} elsif ((-f $f or -p $f) and !is_format_patch_arg($f)) {
+ if ($f ~~ @files) {
+ send_file_twice($f);
+ }
push @files, $f;
} else {
push @rev_list_opts, $f;
--
2.22.0
next reply other threads:[~2019-07-30 0:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 0:13 Dmitry Safonov [this message]
2019-07-30 11:54 ` [PATCH] send-email: Ask if a patch should be sent twice Ævar Arnfjörð Bjarmason
2019-07-30 12:50 ` Dmitry Safonov
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190730001352.7477-1-dima@arista.com \
--to=dima@arista.com \
--cc=0x7f454c46@gmail.com \
--cc=avagin@openvz.org \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.