diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 11:08:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-20 10:19:12 -0700 |
| commit | 0c4dd67a048b39470b9b95912e4912fecc405a85 (patch) | |
| tree | b785fea2d6cfedd40a3e9205dd22adf05d474944 | |
| parent | 00b7cbfcb36b6679c64ad0566c0fc251f7e979fe (diff) | |
| download | git-jc/ignore-epipe-in-filter.tar.gz | |
filter_buffer_or_fd(): ignore EPIPEjc/ignore-epipe-in-filter
We are explicitly ignoring SIGPIPE, as we fully expect that the
filter program may not read our output fully. Ignore EPIPE that
may come from writing to it as well.
A new test was stolen from Jeff's suggestion.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | convert.c | 7 | ||||
| -rwxr-xr-x | t/t0021-conversion.sh | 10 |
2 files changed, 16 insertions, 1 deletions
@@ -356,9 +356,14 @@ static int filter_buffer_or_fd(int in, int out, void *data) sigchain_push(SIGPIPE, SIG_IGN); if (params->src) { - write_err = (write_in_full(child_process.in, params->src, params->size) < 0); + write_err = (write_in_full(child_process.in, + params->src, params->size) < 0); + if (errno == EPIPE) + write_err = 0; } else { write_err = copy_fd(params->fd, child_process.in); + if (write_err == COPY_WRITE_ERROR && errno == EPIPE) + write_err = 0; } if (close(child_process.in)) diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index ca7d2a630a..e0200b9f33 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -204,6 +204,16 @@ test_expect_success 'filtering large input to small output should use little mem GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB ' +test_expect_success 'filter that does not read is fine' ' + test-genrandom foo $((128 * 1024 + 1)) >big && + echo "big filter=epipe" >.gitattributes && + git config filter.epipe.clean "echo xyzzy" && + git add big && + git cat-file blob :big >actual && + echo xyzzy >expect && + test_cmp expect actual +' + test_expect_success EXPENSIVE 'filter large file' ' git config filter.largefile.smudge cat && git config filter.largefile.clean cat && |