Commit 65ca81a63e596f7c8bdfccd15a7bcbf6cfb96cd4
2012-05-08T14:28:21
Minor error fixes Clear the error in pkt when we notice that the remote is starting to send the packfile. Fix the format string for Windows networking errors.
diff --git a/src/netops.c b/src/netops.c
index 057aff8..4d461a0 100644
--- a/src/netops.c
+++ b/src/netops.c
@@ -35,7 +35,7 @@ static void net_set_error(const char *str)
size = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
0, error, 0, (LPSTR)&err_str, 0, 0);
- giterr_set(GITERR_NET, "%s: $s", str, err_str);
+ giterr_set(GITERR_NET, "%s: %s", str, err_str);
LocalFree(err_str);
}
#else
diff --git a/src/pkt.c b/src/pkt.c
index 00836bc..b9c87f1 100644
--- a/src/pkt.c
+++ b/src/pkt.c
@@ -217,6 +217,7 @@ int git_pkt_parse_line(
* server is trying to send us the packfile already.
*/
if (bufflen >= 4 && !git__prefixcmp(line, "PACK")) {
+ giterr_clear();
*out = line;
return pack_pkt(head);
}