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

send-email: use catfile() to concatenate files

Browse Source 
Change send-email to use Perl's catfile() function instead of
"$dir/$file". If send-email is given a $dir that ends with a / we'll
end up printing a double slashed path like "dir//mtfnpy.patch".

This doesn't cause any problems since Perl's IO layer will handle it,
but it looks ugly.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2010-09-14 19:02:24 +00:00
committed by Junio C Hamano
parent 5879b6bbca
commit 89bf1bace3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-send-email.perl
View File

@ -24,6 +24,7 @@ use Text::ParseWords;
use Data::Dumper; use Data::Dumper;
use Term::ANSIColor; use Term::ANSIColor;
use File::Temp qw/ tempdir tempfile /; use File::Temp qw/ tempdir tempfile /;
use File::Spec::Functions qw(catfile);
use Error qw(:try); use Error qw(:try);
use Git; use Git;
@ -511,7 +512,7 @@ while (defined(my $f = shift @ARGV)) {
opendir(DH,$f) opendir(DH,$f)
or die "Failed to opendir $f: $!"; or die "Failed to opendir $f: $!";
push @files, grep { -f $_ } map { +$f . "/" . $_ } push @files, grep { -f $_ } map { catfile($f, $_) }
sort readdir(DH); sort readdir(DH);
closedir(DH); closedir(DH);
} elsif ((-f $f or -p $f) and !check_file_rev_conflict($f)) { } elsif ((-f $f or -p $f) and !check_file_rev_conflict($f)) {