From: Junio C Hamano <gitster@pobox•com>
To: Steffen Prohaska <prohaska@zib•de>
Cc: git@vger•kernel.org, William Throwe <wtt6@cornell•edu>
Subject: Re: [PATCH] Bad file descriptor on filtering empty files
Date: Mon, 22 Dec 2014 10:26:47 -0800 [thread overview]
Message-ID: <xmqq7fxja6c8.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <87sigbmfd5.fsf@cornell.edu> (William Throwe's message of "Fri, 19 Dec 2014 17:41:58 -0500")
William Throwe <wtt6@cornell•edu> writes:
> In git 2.2.0 (also tested on 2.2.0.65.g9abc44b), if an external
> smudge/clean filter is called on an empty file git reports something
> like:
> error: copy-fd: read returned Bad file descriptor
> error: cannot feed the input to external filter cat
> error: external filter cat failed
>
> Test case:
>
> mkdir bug
> cd bug
> git init
> git config filter.cat.clean cat
> git config filter.cat.smudge cat
> echo '* filter=cat' >.gitattributes
> touch a
> git add a
>
>
> This started in 9035d75a2be9d80d82676504d69553245017f6d4, which
> introduced the possible call to copy_fd in code called from
> apply_filter. It appears that NULL as the src argument to apply_filter
> is being used both as a sentinel value to indicate that the fd should be
> used instead and also as a representation of the contents of an empty
> file. I suggest switching to using fd == -1 as the sentinel as shown in
> the patch below.
>
> Thanks,
> Will
>
William, thanks for raising this issue.
Steffen, comments?
> diff --git a/convert.c b/convert.c
> index 9a5612e..0509ac1 100644
> --- a/convert.c
> +++ b/convert.c
> @@ -355,7 +355,7 @@ static int filter_buffer_or_fd(int in, int out, void *data)
>
> sigchain_push(SIGPIPE, SIG_IGN);
>
> - if (params->src) {
> + if (params->fd == -1) {
> write_err = (write_in_full(child_process.in, params->src, params->size) < 0);
> } else {
> write_err = copy_fd(params->fd, child_process.in);
prev parent reply other threads:[~2014-12-22 18:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-19 22:41 [PATCH] Bad file descriptor on filtering empty files William Throwe
2014-12-22 18:26 ` Junio C Hamano [this message]
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=xmqq7fxja6c8.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=prohaska@zib$(echo .)de \
--cc=wtt6@cornell$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox