From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Oct 2017 05:52:22 +0000 (+0900)
Subject: Merge branch 'jt/oidmap'
X-Git-Tag: v2.15.0-rc1~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/54bd705a9589d33b155588aa11d3b856f252e83d?hp=-c

Merge branch 'jt/oidmap'

Introduce a new "oidmap" API and rewrite oidset to use it.

* jt/oidmap:
oidmap: map with OID as key
---

54bd705a9589d33b155588aa11d3b856f252e83d
diff --combined Makefile
index b143e4eea3,64136dde48..cd75985991
--- a/Makefile
+++ b/Makefile
@@@ -205,9 -205,6 +205,9 @@@ all:
  #
  # Define NO_MMAP if you want to avoid mmap.
  #
 +# Define MMAP_PREVENTS_DELETE if a file that is currently mmapped cannot be
 +# deleted or cannot be replaced using rename().
 +#
  # Define NO_SYS_POLL_H if you don't have sys/poll.h.
  #
  # Define NO_POLL if you do not have or don't want to use poll().
@@@ -824,6 -821,7 +824,7 @@@ LIB_OBJS += notes-cache.
  LIB_OBJS += notes-merge.o
  LIB_OBJS += notes-utils.o
  LIB_OBJS += object.o
+ LIB_OBJS += oidmap.o
  LIB_OBJS += oidset.o
  LIB_OBJS += packfile.o
  LIB_OBJS += pack-bitmap.o
@@@ -1394,9 -1392,6 +1395,9 @@@ els
  		COMPAT_OBJS += compat/win32mmap.o
  	endif
  endif
 +ifdef MMAP_PREVENTS_DELETE
 +	BASIC_CFLAGS += -DMMAP_PREVENTS_DELETE
 +endif
  ifdef OBJECT_CREATION_USES_RENAMES
  	COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1
  endif