From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2024 21:50:30 +0000 (-0700)
Subject: Merge branch 'jt/reftable-geometric-compaction'
X-Git-Tag: v2.45.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82a31ec32441cd06daa5e0397a73f4159cdaad4b;p=thirdparty%2Fgit.git

Merge branch 'jt/reftable-geometric-compaction'

The strategy to compact multiple tables of reftables after many
operations accumulate many entries has been improved to avoid
accumulating too many tables uncollected.

* jt/reftable-geometric-compaction:
  reftable/stack: use geometric table compaction
  reftable/stack: add env to disable autocompaction
  reftable/stack: expose option to disable auto-compaction
---

82a31ec32441cd06daa5e0397a73f4159cdaad4b
diff --cc t/t0610-reftable-basics.sh
index 238d4923c4,8eec093788..178791e086
--- a/t/t0610-reftable-basics.sh
+++ b/t/t0610-reftable-basics.sh
@@@ -114,36 -112,7 +114,36 @@@ test_expect_reftable_perms () 
  			return 1
  		done
  	'
 -done
 +
 +	test_expect_success POSIXPERM "pack-refs: honors --shared=$shared with umask $umask" '
 +		test_when_finished "rm -rf repo" &&
 +		(
 +			umask $umask &&
 +			git init --shared=$shared repo &&
 +			test_commit -C repo A &&
- 			test_line_count = 3 repo/.git/reftable/tables.list &&
++			test_line_count = 2 repo/.git/reftable/tables.list &&
 +			git -C repo pack-refs
 +		) &&
 +		test_expect_perms "$expect" repo/.git/reftable/tables.list &&
 +		for table in repo/.git/reftable/*.ref
 +		do
 +			test_expect_perms "$expect" "$table" ||
 +			return 1
 +		done
 +	'
 +}
 +
 +test_expect_reftable_perms 002 umask "-rw-rw-r--"
 +test_expect_reftable_perms 022 umask "-rw-r--r--"
 +test_expect_reftable_perms 027 umask "-rw-r-----"
 +
 +test_expect_reftable_perms 002 group "-rw-rw-r--"
 +test_expect_reftable_perms 022 group "-rw-rw-r--"
 +test_expect_reftable_perms 027 group "-rw-rw----"
 +
 +test_expect_reftable_perms 002 world "-rw-rw-r--"
 +test_expect_reftable_perms 022 world "-rw-rw-r--"
 +test_expect_reftable_perms 027 world "-rw-rw-r--"
  
  test_expect_success 'clone: can clone reftable repository' '
  	test_when_finished "rm -rf repo clone" &&