From 070e5f72d9d6f0056895bd3222e75f8075ed4c0e Mon Sep 17 00:00:00 2001 From: Ben Peart Date: Fri, 5 May 2017 11:27:53 -0400 Subject: convert: remove erroneous tests for errno == EPIPE 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 Found/Fixed-by: Jeff King Acked-by: Lars Schneider Signed-off-by: Junio C Hamano --- convert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'convert.c') diff --git a/convert.c b/convert.c index 8d652bf27..390841672 100644 --- 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")) { -- cgit v1.2.1