convert: remove erroneous tests for errno == EPIPE
authorBen Peart <peartben@gmail.com>
Fri, 5 May 2017 15:27:53 +0000 (11:27 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 May 2017 01:57:26 +0000 (10:57 +0900)
start_multi_file_filter() and apply_multi_file_filter() currently test
for errno == EPIPE but treating EPIPE as an error is already happening
from one of the packet_write() functions.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Found/Fixed-by: Jeff King <peff@peff.net>
Acked-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
convert.c

index 8d652bf..3908416 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -661,7 +661,7 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons
 done:
        sigchain_pop(SIGPIPE);
 
-       if (err || errno == EPIPE) {
+       if (err) {
                error("initialization for external filter '%s' failed", cmd);
                kill_multi_file_filter(hashmap, entry);
                return NULL;
@@ -752,7 +752,7 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
 done:
        sigchain_pop(SIGPIPE);
 
-       if (err || errno == EPIPE) {
+       if (err) {
                if (!strcmp(filter_status.buf, "error")) {
                        /* The filter signaled a problem with the file. */
                } else if (!strcmp(filter_status.buf, "abort")) {