undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/send-email-catfile'

Browse Source 
* ab/send-email-catfile:
  send-email: use catfile() to concatenate files
This commit is contained in:
Junio C Hamano 2010-09-29 13:50:02 -07:00
commit 34289ec35f
1 changed files with 2 additions and 1 deletions
Show Stats 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 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)) {