summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorBen Peart <peartben@gmail.com>2017-05-05 11:27:53 -0400
committerJunio C Hamano <gitster@pobox.com>2017-05-08 10:57:26 +0900
commit070e5f72d9d6f0056895bd3222e75f8075ed4c0e (patch)
treef2bec74468c46aa633f3ca8e48f7f497a4e57945 /convert.c
parente1104a5ee539408b81566066aaa6963cb87d5cd6 (diff)
downloadgit-070e5f72d9d6f0056895bd3222e75f8075ed4c0e.tar.gz
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 <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>
Diffstat (limited to 'convert.c')
-rw-r--r--convert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/convert.c b/convert.c
index 8d652bf27c..3908416726 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")) {