Merge branch 'jk/dont-count-existing-objects-twice'

gitster · gitster · commit 221b755f3a99 · 2020-09-22T12:36:32.000-07:00
There is a logic to estimate how many objects are in the
repository, which is mean to run once per process invocation, but
it ran every time the estimated value was requested.

* jk/dont-count-existing-objects-twice:
  packfile: actually set approximate_object_count_valid
diff --git a/packfile.c b/packfile.c
@@ -923,6 +923,7 @@ unsigned long repo_approximate_object_count(struct repository *r)
 			count += p->num_objects;
 		}
 		r->objects->approximate_object_count = count;
+		r->objects->approximate_object_count_valid = 1;
 	}
 	return r->objects->approximate_object_count;
 }
diff --git a/t/perf/p5303-many-packs.sh b/t/perf/p5303-many-packs.sh
@@ -73,6 +73,10 @@ do
 		git rev-list --objects --all >/dev/null
 	'
 
+	test_perf "abbrev-commit ($nr_packs)" '
+		git rev-list --abbrev-commit HEAD >/dev/null
+	'
+
 	# This simulates the interesting part of the repack, which is the
 	# actual pack generation, without smudging the on-disk setup
 	# between trials.

Original file line number	Diff line number	Diff line change
`@@ -923,6 +923,7 @@ unsigned long repo_approximate_object_count(struct repository *r)`
`923`	`923`	`count += p->num_objects;`
`924`	`924`	`}`
`925`	`925`	`r->objects->approximate_object_count = count;`
	`926`	`+ r->objects->approximate_object_count_valid = 1;`
`926`	`927`	`}`
`927`	`928`	`return r->objects->approximate_object_count;`
`928`	`929`	`}`