blame.c: replace instance of !oidcmp for oideq

[thirdparty/git.git] / upload-pack.c

diff --git a/upload-pack.c b/upload-pack.c
index c53249cac19a33351f4f747782b71f877fc0692f..902d0ad5e157fde33ec013476086740946e285df 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1252,7 +1252,7 @@ static void process_args(struct packet_reader *request,
                         struct upload_pack_data *data,
                         struct object_array *want_obj)
 {
-       while (packet_reader_read(request) != PACKET_READ_FLUSH) {
+       while (packet_reader_read(request) == PACKET_READ_NORMAL) {
                const char *arg = request->line;
                const char *p;
 
@@ -1321,6 +1321,9 @@ static void process_args(struct packet_reader *request,
                /* ignore unknown lines maybe? */
                die("unexpected line: '%s'", arg);
        }
+
+       if (request->status != PACKET_READ_FLUSH)
+               die(_("expected flush after fetch arguments"));
 }
 
 static int process_haves(struct oid_array *haves, struct oid_array *common,