send-email: use catfile() to concatenate files

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>

diff --git a/git-send-email.perl b/git-send-email.perl
index 6dab3bf6a74bb52c7294e33dbac5bf87b51a9fdf..7f702e379fa0166442515de33cf8c2381a40f3c2 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -24,6 +24,7 @@
 use Data::Dumper;
 use Term::ANSIColor;
 use File::Temp qw/ tempdir tempfile /;
 use Data::Dumper;
 use Term::ANSIColor;
 use File::Temp qw/ tempdir tempfile /;

+use File::Spec::Functions qw(catfile);

 use Error qw(:try);
 use Git;
 
 use Error qw(:try);
 use Git;
 


@@ -511,7 +512,7 @@ ($)
                opendir(DH,$f)
                        or die "Failed to opendir $f: $!";
 
                opendir(DH,$f)
                        or die "Failed to opendir $f: $!";
 

-               push @files, grep { -f $_ } map { +$f . "/" . $_ }
+               push @files, grep { -f $_ } map { catfile($f, $_) }

                                sort readdir(DH);
                closedir(DH);
        } elsif ((-f $f or -p $f) and !check_file_rev_conflict($f)) {
                                sort readdir(DH);
                closedir(DH);
        } elsif ((-f $f or -p $f) and !check_file_rev_conflict($f)) {