summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-04-30 04:50:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-30 04:50:26 (GMT)
commita1cac26cc60f611b2f94badfc9c8522a65e79dc1 (patch)
tree5bbbdc78161815ae9a3b68e3cb0469dbefbc998a /Makefile
parent59bb0aa93e6edaca44b2a5488fc915d468bae46f (diff)
parent68e66f2987724a639c896e7996ea347be62ef578 (diff)
downloadgit-a1cac26cc60f611b2f94badfc9c8522a65e79dc1.zip
git-a1cac26cc60f611b2f94badfc9c8522a65e79dc1.tar.gz
git-a1cac26cc60f611b2f94badfc9c8522a65e79dc1.tar.bz2
Merge branch 'mt/parallel-checkout-part-2'
The checkout machinery has been taught to perform the actual write-out of the files in parallel when able. * mt/parallel-checkout-part-2: parallel-checkout: add design documentation parallel-checkout: support progress displaying parallel-checkout: add configuration options parallel-checkout: make it truly parallel unpack-trees: add basic support for parallel checkout
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index bebc734..93664d6 100644
--- a/Makefile
+++ b/Makefile
@@ -948,6 +948,7 @@ LIB_OBJS += pack-revindex.o
LIB_OBJS += pack-write.o
LIB_OBJS += packfile.o
LIB_OBJS += pager.o
+LIB_OBJS += parallel-checkout.o
LIB_OBJS += parse-options-cb.o
LIB_OBJS += parse-options.o
LIB_OBJS += patch-delta.o
@@ -1064,6 +1065,7 @@ BUILTIN_OBJS += builtin/check-attr.o
BUILTIN_OBJS += builtin/check-ignore.o
BUILTIN_OBJS += builtin/check-mailmap.o
BUILTIN_OBJS += builtin/check-ref-format.o
+BUILTIN_OBJS += builtin/checkout--worker.o
BUILTIN_OBJS += builtin/checkout-index.o
BUILTIN_OBJS += builtin/checkout.o
BUILTIN_OBJS += builtin/clean.o