git.txt: remove empty line before list continuation
[gitweb.git] / send-pack.c
index 9136450464b4c598e229a97419b5be6a55962e46..6dc16c3211631402432207dcf99b1ef4e87f012b 100644 (file)
@@ -40,7 +40,7 @@ int option_parse_push_signed(const struct option *opt,
 
 static void feed_object(const struct object_id *oid, FILE *fh, int negative)
 {
-       if (negative && !has_sha1_file(oid->hash))
+       if (negative && !has_object_file(oid))
                return;
 
        if (negative)
@@ -558,7 +558,9 @@ int send_pack(struct send_pack_args *args,
                in = demux.out;
        }
 
-       packet_reader_init(&reader, in, NULL, 0, PACKET_READ_CHOMP_NEWLINE);
+       packet_reader_init(&reader, in, NULL, 0,
+                          PACKET_READ_CHOMP_NEWLINE |
+                          PACKET_READ_DIE_ON_ERR_PACKET);
 
        if (need_pack_data && cmds_sent) {
                if (pack_objects(out, remote_refs, extra_have, args) < 0) {