From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Oct 2023 18:39:14 +0000 (-0700)
Subject: Merge branch 'eb/limit-bulk-checkin-to-blobs'
X-Git-Tag: v2.43.0-rc0~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3df51ea0a5ef88b801ab30ca28f159b898183926;p=thirdparty%2Fgit.git

Merge branch 'eb/limit-bulk-checkin-to-blobs'

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
---

3df51ea0a5ef88b801ab30ca28f159b898183926
diff --cc bulk-checkin.c
index 92b9c8598b,223562b4e7..6ce62999e5
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@@ -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)