From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Sep 2007 05:33:28 +0000 (-0700)
Subject: Merge branch 'np/delta'
X-Git-Tag: v1.5.4-rc0~440
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d225ae59c9102f2769c55749f80f7a94a92713e4;p=git.git

Merge branch 'np/delta'

* np/delta:
  builtin-pack-objects.c: avoid bogus gcc warnings
  threaded delta search: proper locking for cache accounting
  threaded delta search: add pack.threads config variable
  fix threaded delta search locking
  threaded delta search: specify number of threads at run time
  threaded delta search: better chunck split point
  threaded delta search: refine work allocation
  basic threaded delta search
  rearrange delta search progress reporting
  localize window memory usage accounting
  straighten the list of objects to deltify
---

d225ae59c9102f2769c55749f80f7a94a92713e4
diff --cc Makefile
index 78cdaa155,a92fb3169..40567ece1
--- a/Makefile
+++ b/Makefile
@@@ -670,11 -664,12 +673,16 @@@ ifdef NO_HSTRERRO
  	COMPAT_CFLAGS += -DNO_HSTRERROR
  	COMPAT_OBJS += compat/hstrerror.o
  endif
 +ifdef NO_MEMMEM
 +	COMPAT_CFLAGS += -DNO_MEMMEM
 +	COMPAT_OBJS += compat/memmem.o
 +endif
  
+ ifdef THREADED_DELTA_SEARCH
+ 	BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
+ 	EXTLIBS += -lpthread
+ endif
+ 
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK=NoThanks
  endif