From: Ben Peart <peartben@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, benpeart@microsoft.com,
christian.couder@gmail.com, larsxschneider@gmail.com,
peff@peff.net
Subject: [PATCH v7 01/10] convert: remove erroneous tests for errno == EPIPE
Date: Fri, 5 May 2017 11:27:53 -0400 [thread overview]
Message-ID: <20170505152802.6724-2-benpeart@microsoft.com> (raw)
In-Reply-To: <20170505152802.6724-1-benpeart@microsoft.com>
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>
---
convert.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/convert.c b/convert.c
index 4e17e45ed2..bdd528086f 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")) {
--
2.12.2.gvfs.2.20.g3624a68d62.dirty
next prev parent reply other threads:[~2017-05-05 15:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-05 15:27 [PATCH v7 00/10] refactor the filter process code into a reusable module Ben Peart
2017-05-05 15:27 ` Ben Peart [this message]
2017-05-05 15:27 ` [PATCH v7 02/10] pkt-line: fix packet_read_line() to handle len < 0 errors Ben Peart
2017-05-05 15:27 ` [PATCH v7 03/10] pkt-line: add packet_read_line_gently() Ben Peart
2017-05-05 15:27 ` [PATCH v7 04/10] convert: move packet_write_line() into pkt-line as packet_writel() Ben Peart
2017-05-13 9:04 ` Jeff King
2017-05-15 4:02 ` Junio C Hamano
2017-05-05 15:27 ` [PATCH v7 05/10] convert: split start_multi_file_filter() into two separate functions Ben Peart
2017-05-05 15:27 ` [PATCH v7 06/10] convert: Separate generic structures and variables from the filter specific ones Ben Peart
2017-05-05 15:27 ` [PATCH v7 07/10] convert: Update generic functions to only use generic data structures Ben Peart
2017-05-05 15:28 ` [PATCH v7 08/10] convert: rename reusable sub-process functions Ben Peart
2017-05-05 15:28 ` [PATCH v7 09/10] sub-process: move sub-process functions into separate files Ben Peart
2017-05-13 9:07 ` Jeff King
2017-05-05 15:28 ` [PATCH v7 10/10] convert: Update subprocess_read_status to not die on EOF Ben Peart
2017-05-08 1:58 ` [PATCH v7 00/10] refactor the filter process code into a reusable module Junio C Hamano
2017-05-13 9:16 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170505152802.6724-2-benpeart@microsoft.com \
--to=peartben@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.