From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Oct 2020 22:09:47 +0000 (-0700)
Subject: Merge branch 'ds/maintenance-part-2'
X-Git-Tag: v2.30.0-rc0~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52b8c8c7165987650bf873b878f20b14c33b268f;p=thirdparty%2Fgit.git

Merge branch 'ds/maintenance-part-2'

"git maintenance", an extended big brother of "git gc", continues
to evolve.

* ds/maintenance-part-2:
  maintenance: add incremental-repack auto condition
  maintenance: auto-size incremental-repack batch
  maintenance: add incremental-repack task
  midx: use start_delayed_progress()
  midx: enable core.multiPackIndex by default
  maintenance: create auto condition for loose-objects
  maintenance: add loose-objects task
  maintenance: add prefetch task
---

52b8c8c7165987650bf873b878f20b14c33b268f
diff --cc midx.c
index 0de42ffdfb,aa37d5da86..d233b54ac7
--- a/midx.c
+++ b/midx.c
@@@ -1116,20 -1100,11 +1111,20 @@@ int verify_midx_file(struct repository 
  	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
  	verify_midx_error = 0;
  
 -	if (!m)
 -		return 0;
 +	if (!m) {
 +		int result = 0;
 +		struct stat sb;
 +		char *filename = get_midx_filename(object_dir);
 +		if (!stat(filename, &sb)) {
 +			error(_("multi-pack-index file exists, but failed to parse"));
 +			result = 1;
 +		}
 +		free(filename);
 +		return result;
 +	}
  
  	if (flags & MIDX_PROGRESS)
- 		progress = start_progress(_("Looking for referenced packfiles"),
+ 		progress = start_delayed_progress(_("Looking for referenced packfiles"),
  					  m->num_packs);
  	for (i = 0; i < m->num_packs; i++) {
  		if (prepare_midx_pack(r, m, i))
diff --cc t/t5319-multi-pack-index.sh
index f340b376bc,2f942ee1fa..ace469c95c
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@@ -3,10 -3,9 +3,11 @@@
  test_description='multi-pack-indexes'
  . ./test-lib.sh
  
+ GIT_TEST_MULTI_PACK_INDEX=0
  objdir=.git/objects
  
 +HASH_LEN=$(test_oid rawsz)
 +
  midx_read_expect () {
  	NUM_PACKS=$1
  	NUM_OBJECTS=$2