diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-09-14 19:02:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-14 12:27:01 -0700 |
| commit | 89bf1bace388c118137261e852635db92e607888 (patch) | |
| tree | 96c6ed7e643816f3256d4e8e023423f7f581eb79 /git-send-email.perl | |
| parent | 5879b6bbcaba7696e4abfa717748da166f915405 (diff) | |
| download | git-89bf1bace388c118137261e852635db92e607888.tar.gz | |
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>
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 6dab3bf6a7..7f702e379f 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -24,6 +24,7 @@ use Text::ParseWords; use Data::Dumper; use Term::ANSIColor; use File::Temp qw/ tempdir tempfile /; +use File::Spec::Functions qw(catfile); use Error qw(:try); use Git; @@ -511,7 +512,7 @@ while (defined(my $f = shift @ARGV)) { 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)) { |