From: Jeff King <peff@peff.net>
Date: Mon, 25 Mar 2013 20:18:16 +0000 (-0400)
Subject: read_istream_filtered: propagate read error from upstream
X-Git-Tag: v1.8.3-rc0~125^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/42e7e2a53492ed1772b7b5d8b328f8d0a66f8b33?ds=inline;hp=--cc

read_istream_filtered: propagate read error from upstream

The filter istream pulls data from an "upstream" stream,
running it through a filter function. However, we did not
properly notice when the upstream filter yielded an error,
and just returned what we had read. Instead, we should
propagate the error.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

42e7e2a53492ed1772b7b5d8b328f8d0a66f8b33
diff --git a/streaming.c b/streaming.c
index f4126a7da5..f4ab12ba42 100644
--- a/streaming.c
+++ b/streaming.c
@@ -237,7 +237,7 @@ static read_method_decl(filtered)
 		if (!fs->input_finished) {
 			fs->i_end = read_istream(fs->upstream, fs->ibuf, FILTER_BUFFER);
 			if (fs->i_end < 0)
-				break;
+				return -1;
 			if (fs->i_end)
 				continue;
 		}