Skip to content

Commit

Permalink
Merge branch 'ab/send-email-catfile'
Browse files Browse the repository at this point in the history
* ab/send-email-catfile:
  send-email: use catfile() to concatenate files
  • Loading branch information
Junio C Hamano committed Sep 29, 2010
2 parents a27d5be + 89bf1ba commit 34289ec
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-send-email.perl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
use Data::Dumper;
use Term::ANSIColor;
use File::Temp qw/ tempdir tempfile /;
use File::Spec::Functions qw(catfile);
use Error qw(:try);
use Git;

Expand Down Expand Up @@ -511,7 +512,7 @@ ($)
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)) {
Expand Down

0 comments on commit 34289ec

Please sign in to comment.