mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-email: detect and offer to skip backup files

Browse Source 
Diligent people save output from format-patch to files, proofread
and edit them and then finally send the result out.  If the
resulting files are sent out with "git send-email 0*", this ends up
sending backup files (e.g. 0001-X.patch.backup or 0001-X.patch~)
left by their editors next to the final version.  Sending them with
"git send-email 0*.patch" (if format-patch was run with the standard
suffix) would avoid such an embarrassment, but not everybody is
careful.

After collecting files to be sent (and sorting them if read from a
directory), notice when the file being sent out has the same name as
the previous file, plus some suffix (e.g. 0001-X.patch was sent, and
we are looking at 0001-X.patch.backup or 0001-X.patch~), and the
suffix begins with a non-alnum (e.g. ".backup" or "~") and ask if
the user really wants to send it out.  Once the user skips sending
such a "backup" file, remember the suffix and stop asking the same
question (e.g. after skipping 0001-X.patch~, skip 0002-Y.patch~
without asking).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2016-03-17 22:40:05 -07:00
parent 937978e0f3
commit 531220ba50
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
git-send-email.perl
View File

@ -621,6 +621,8 @@ if (@rev_list_opts) {
push @files, $repo->command('format-patch', '-o', tempdir(CLEANUP => 1), @rev_list_opts); push @files, $repo->command('format-patch', '-o', tempdir(CLEANUP => 1), @rev_list_opts);
} }
@files = handle_backup_files(@files);
if ($validate) { if ($validate) {
foreach my $f (@files) { foreach my $f (@files) {
unless (-p $f) { unless (-p $f) {
@ -1726,6 +1728,44 @@ sub validate_patch {
return; return;
} }
sub handle_backup {
my ($last, $lastlen, $file, $known_suffix) = @_;
my ($suffix, $skip);
$skip = 0;
if (defined $last &&
($lastlen < length($file)) &&
(substr($file, 0, $lastlen) eq $last) &&
($suffix = substr($file, $lastlen)) !~ /^[a-z0-9]/i) {
if (defined $known_suffix && $suffix eq $known_suffix) {
print "Skipping $file with backup suffix '$known_suffix'.\n";
$skip = 1;
} else {
my $answer = ask("Do you really want to send $file? (y|N): ",
valid_re => qr/^(?:y|n)/i,
default => 'n');
$skip = ($answer ne 'y');
if ($skip) {
$known_suffix = $suffix;
}
}
}
return ($skip, $known_suffix);
}
sub handle_backup_files {
my @file = @_;
my ($last, $lastlen, $known_suffix, $skip, @result);
for my $file (@file) {
($skip, $known_suffix) = handle_backup($last, $lastlen,
$file, $known_suffix);
push @result, $file unless $skip;
$last = $file;
$lastlen = length($file);
}
return @result;
}
sub file_has_nonascii { sub file_has_nonascii {
my $fn = shift; my $fn = shift;
open(my $fh, '<', $fn) open(my $fh, '<', $fn)