commit d9914fb7c63ebf4dd171ca1589577a44526888d2
author Edward Thomson <ethomson@edwardthomson.com> Mon Jun 12 21:22:27 2017 +0100
committer GitHub <noreply@github.com> Mon Jun 12 21:22:27 2017 +0100
tree d9c7843347f3ebef204b184ce43bb5dc787f886d
parent 9927e9587aff31c85916028ae9bee2a21a413a8f
parent 844e85f21d2252af34aa2a2e9b7eae43ed7dd9a2

Merge pull request #4266 from libgit2/ethomson/travis-explicit-openssl

travis: install openssl explicitly

src/odb.c

diff --git a/src/odb.c b/src/odb.c
index b66324f..ae8f247 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -1116,8 +1116,11 @@
 		if (b->read_prefix != NULL) {
 			git_oid full_oid;
 			error = b->read_prefix(&full_oid, &raw.data, &raw.len, &raw.type, b, key, len);
-			if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH)
+
+			if (error == GIT_ENOTFOUND || error == GIT_PASSTHROUGH) {
+				error = 0;
 				continue;
+			}
 
 			if (error)
 				goto out;

src/transports/smart_protocol.c

diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c
index 25e78c6..8146fa1 100644
--- a/src/transports/smart_protocol.c
+++ b/src/transports/smart_protocol.c
@@ -325,7 +325,8 @@
 
 		if (pkt->type == GIT_PKT_ACK &&
 		    (pkt->status != GIT_ACK_CONTINUE &&
-		     pkt->status != GIT_ACK_COMMON)) {
+		     pkt->status != GIT_ACK_COMMON &&
+		     pkt->status != GIT_ACK_READY)) {
 			git__free(pkt);
 			return 0;
 		}