From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 May 2021 12:05:23 +0000 (+0900)
Subject: Merge branch 'mt/parallel-checkout-part-3'
X-Git-Tag: v2.32.0-rc0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a737e1f1d25747481bd4925555006f569e461117;p=thirdparty%2Fgit.git

Merge branch 'mt/parallel-checkout-part-3'

The final part of "parallel checkout".

* mt/parallel-checkout-part-3:
  ci: run test round with parallel-checkout enabled
  parallel-checkout: add tests related to .gitattributes
  t0028: extract encoding helpers to lib-encoding.sh
  parallel-checkout: add tests related to path collisions
  parallel-checkout: add tests for basic operations
  checkout-index: add parallel checkout support
  builtin/checkout.c: complete parallel checkout support
  make_transient_cache_entry(): optionally alloc from mem_pool
---

a737e1f1d25747481bd4925555006f569e461117
diff --cc builtin/checkout.c
index 0bf61e6eef,99384d5c7a..f4cd7747d3
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -369,9 -374,9 +374,13 @@@ static int checkout_worktree(const stru
  			       NULL);
  
  	enable_delayed_checkout(&state);
 +
+ 	if (pc_workers > 1)
+ 		init_parallel_checkout();
+ 
 +	/* TODO: audit for interaction with sparse-index. */
 +	ensure_full_index(&the_index);
++
  	for (pos = 0; pos < active_nr; pos++) {
  		struct cache_entry *ce = active_cache[pos];
  		if (ce->ce_flags & CE_MATCHED) {
diff --cc t/README
index 8eb9e46b1d,a194488f27..a8cfd37387
--- a/t/README
+++ b/t/README
@@@ -436,9 -436,10 +436,13 @@@ and "sha256"
  GIT_TEST_WRITE_REV_INDEX=<boolean>, when true enables the
  'pack.writeReverseIndex' setting.
  
 +GIT_TEST_SPARSE_INDEX=<boolean>, when true enables index writes to use the
 +sparse-index format by default.
 +
+ GIT_TEST_CHECKOUT_WORKERS=<n> overrides the 'checkout.workers' setting
+ to <n> and 'checkout.thresholdForParallelism' to 0, forcing the
+ execution of the parallel-checkout code.
+ 
  Naming Tests
  ------------