From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 May 2019 15:37:23 +0000 (+0900)
Subject: Merge branch 'jk/pack-objects-reports-num-objects-to-trace2'
X-Git-Tag: v2.22.0-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3d67555744e6d4fbbc52b0a67c4b630c5d319bc2?ds=inline;hp=-c

Merge branch 'jk/pack-objects-reports-num-objects-to-trace2'

The "git pack-objects" command learned to report the number of
objects it packed via the trace2 mechanism.

* jk/pack-objects-reports-num-objects-to-trace2:
pack-objects: write objects packed to trace2
---

3d67555744e6d4fbbc52b0a67c4b630c5d319bc2
diff --combined builtin/pack-objects.c
index 2d9a3bdc9d,3326aeb497..d7743f110b
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@@ -964,6 -964,8 +964,8 @@@ static void write_pack_file(void
  	if (written != nr_result)
  		die(_("wrote %"PRIu32" objects while expecting %"PRIu32),
  		    written, nr_result);
+ 	trace2_data_intmax("pack-objects", the_repository,
+ 			   "write_pack_file/wrote", nr_result);
  }
  
  static int no_try_delta(const char *path)
@@@ -1487,7 -1489,6 +1489,7 @@@ static int can_reuse_delta(const unsign
  			   struct object_entry **base_out)
  {
  	struct object_entry *base;
 +	struct object_id base_oid;
  
  	if (!base_sha1)
  		return 0;
@@@ -1509,9 -1510,10 +1511,9 @@@
  	 * even if it was buried too deep in history to make it into the
  	 * packing list.
  	 */
 -	if (thin && bitmap_has_sha1_in_uninteresting(bitmap_git, base_sha1)) {
 +	oidread(&base_oid, base_sha1);
 +	if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, &base_oid)) {
  		if (use_delta_islands) {
 -			struct object_id base_oid;
 -			hashcpy(base_oid.hash, base_sha1);
  			if (!in_same_island(&delta->idx.oid, &base_oid))
  				return 0;
  		}