diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:50:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:50:02 -0700 |
| commit | 34289ec35f2c9b1d7a1956e609a053f982e2ddd3 (patch) | |
| tree | 34f78af744f6e6765d976dff491156ec008d947e /git-send-email.perl | |
| parent | a27d5bef56d0689873b29236addf4f7879e974ec (diff) | |
| parent | 89bf1bace388c118137261e852635db92e607888 (diff) | |
| download | git-34289ec35f2c9b1d7a1956e609a053f982e2ddd3.tar.gz | |
Merge branch 'ab/send-email-catfile'
* ab/send-email-catfile:
send-email: use catfile() to concatenate files
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 e1f29a72a1..08c8c3c25f 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)) { |