]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'eb/limit-bulk-checkin-to-blobs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Oct 2023 18:39:14 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Oct 2023 18:39:14 +0000 (11:39 -0700)
The "streaming" interface used for bulk-checkin codepath has been
narrowed to take only blob objects for now, with no real loss of
functionality.

* eb/limit-bulk-checkin-to-blobs:
  bulk-checkin: only support blobs in index_bulk_checkin

1  2 
bulk-checkin.c

diff --cc bulk-checkin.c
index 92b9c8598b46f1fa654adadd07adef601c314a64,223562b4e74883a6c33549af9c2a0d7cbcb8f9b7..6ce62999e58523e20a686801446daaf0d924e9be
@@@ -265,10 -264,9 +264,10 @@@ static int deflate_blob_to_pack(struct 
                return error("cannot find the current offset");
  
        header_len = format_object_header((char *)obuf, sizeof(obuf),
-                                         type, size);
+                                         OBJ_BLOB, size);
        the_hash_algo->init_fn(&ctx);
        the_hash_algo->update_fn(&ctx, obuf, header_len);
 +      the_hash_algo->init_fn(&checkpoint.ctx);
  
        /* Note: idx is non-NULL when we are writing */
        if ((flags & HASH_WRITE_OBJECT) != 0)