Merge branch 'ab/send-email-catfile'

gitster · gitster · commit 34289ec35f2c · 2010-09-29T13:50:02.000-07:00
* ab/send-email-catfile:
  send-email: use catfile() to concatenate files
diff --git 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 File::Spec::Functions qw(catfile);
 use Error qw(:try);
 use Git;
 
@@ -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)) {
