Merge branch 'jh/simple-ipc'

[thirdparty/git.git] / convert.c

diff --git a/convert.c b/convert.c
index 3298e4acff5ac78895529578234022f5d598ecc6..45ac75f80c8e943ad76877266d2cc64cce3f38d8 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -873,9 +873,13 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
                goto done;
 
        if (fd >= 0)
-               err = write_packetized_from_fd(fd, process->in);
+               err = write_packetized_from_fd_no_flush(fd, process->in);
        else
-               err = write_packetized_from_buf(src, len, process->in);
+               err = write_packetized_from_buf_no_flush(src, len, process->in);
+       if (err)
+               goto done;
+
+       err = packet_flush_gently(process->in);
        if (err)
                goto done;
 
@@ -892,7 +896,8 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
                if (err)
                        goto done;
 
-               err = read_packetized_to_strbuf(process->out, &nbuf) < 0;
+               err = read_packetized_to_strbuf(process->out, &nbuf,
+                                               PACKET_READ_GENTLE_ON_EOF) < 0;
                if (err)
                        goto done;