summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-14 11:50:40 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-14 11:50:40 -0700
commitcc13431a49800a6a1d2b7ff0b94f67da0fecdbab (patch)
treedb2f27147a21f3b3b053b0af81937bec033219d4 /Makefile
parent3f8acaae8a6a025339c413c663fc8f0d73f29665 (diff)
parentb038a61020573b1be6e5fc5b2be4485b63a9cbf1 (diff)
downloadgit-cc13431a49800a6a1d2b7ff0b94f67da0fecdbab.tar.gz
Merge branch 'nd/threaded-index-pack'
Enables threading in index-pack to resolve base data in parallel. By Nguyễn Thái Ngọc Duy (3) and Ramsay Jones (1) * nd/threaded-index-pack: index-pack: disable threading if NO_PREAD is defined index-pack: support multithreaded delta resolving index-pack: restructure pack processing into three main functions compat/win32/pthread.h: Add an pthread_key_delete() implementation
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3eda1e8c68..96ebcf9830 100644
--- a/Makefile
+++ b/Makefile
@@ -2226,7 +2226,7 @@ builtin/branch.o builtin/checkout.o builtin/clone.o builtin/reset.o branch.o tra
builtin/bundle.o bundle.o transport.o: bundle.h
builtin/bisect--helper.o builtin/rev-list.o bisect.o: bisect.h
builtin/clone.o builtin/fetch-pack.o transport.o: fetch-pack.h
-builtin/grep.o builtin/pack-objects.o transport-helper.o thread-utils.o: thread-utils.h
+builtin/index-pack.o builtin/grep.o builtin/pack-objects.o transport-helper.o thread-utils.o: thread-utils.h
builtin/send-pack.o transport.o: send-pack.h
builtin/log.o builtin/shortlog.o: shortlog.h
builtin/prune.o builtin/reflog.o reachable.o: reachable.h