aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:29 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:29 -0700
commitf7c3cf8106c09c714d46d39e8eef69838db8b339 (patch)
treee181da0fa9f7a4f44da96bfcf8a9b4c598c5910e
parent74c3664186d04ce07591451e1b378eee966b936b (diff)
parent300913bd448def6fe2f943f534a172259725e7c6 (diff)
downloadgit-f7c3cf8106c09c714d46d39e8eef69838db8b339.tar.gz
git-f7c3cf8106c09c714d46d39e8eef69838db8b339.tar.xz
Merge branch 'kb/send-email-fifo'
* kb/send-email-fifo: git-send-email: Accept fifos as well as files
-rwxr-xr-xgit-send-email.perl8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index edb12c2aa..a047b016e 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -408,7 +408,7 @@ for my $f (@ARGV) {
push @files, grep { -f $_ } map { +$f . "/" . $_ }
sort readdir(DH);
- } elsif (-f $f) {
+ } elsif (-f $f or -p $f) {
push @files, $f;
} else {
@@ -418,8 +418,10 @@ for my $f (@ARGV) {
if (!$no_validate) {
foreach my $f (@files) {
- my $error = validate_patch($f);
- $error and die "fatal: $f: $error\nwarning: no patches were sent\n";
+ unless (-p $f) {
+ my $error = validate_patch($f);
+ $error and die "fatal: $f: $error\nwarning: no patches were sent\n";
+ }
}
}