From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Dec 2021 20:44:49 +0000 (-0800)
Subject: Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
X-Git-Tag: v2.36.0-rc0~154^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb4921cf45e11d063e7bbe55f594adf8f0077d5d;p=thirdparty%2Fgit.git

Merge branch 'hn/reftable' into hn/reftable-coverity-fixes

* hn/reftable:
  Add "test-tool dump-reftable" command.
  reftable: add dump utility
  reftable: implement stack, a mutable database of reftable files.
  reftable: implement refname validation
  reftable: add merged table view
  reftable: add a heap-based priority queue for reftable records
  reftable: reftable file level tests
  reftable: read reftable files
  reftable: generic interface to tables
  reftable: write reftable files
  reftable: a generic binary tree implementation
  reftable: reading/writing blocks
  Provide zlib's uncompress2 from compat/zlib-compat.c
  reftable: (de)serialization for the polymorphic record type.
  reftable: add blocksource, an abstraction for random access reads
  reftable: utility functions
  reftable: add error related functionality
  reftable: add LICENSE
  hash.h: provide constants for the hash IDs
---

bb4921cf45e11d063e7bbe55f594adf8f0077d5d
diff --cc Makefile
index d56c0e4aad,3d80975c70..142af3ec89
--- a/Makefile
+++ b/Makefile
@@@ -2584,11 -2648,17 +2625,17 @@@ $(REMOTE_CURL_PRIMARY): remote-curl.o h
  		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
  
  $(LIB_FILE): $(LIB_OBJS)
 -	$(QUIET_AR)$(AR) $(ARFLAGS) $@ $^
 +	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
  
  $(XDIFF_LIB): $(XDIFF_OBJS)
 -	$(QUIET_AR)$(AR) $(ARFLAGS) $@ $^
 +	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
  
+ $(REFTABLE_LIB): $(REFTABLE_OBJS)
+ 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+ 
+ $(REFTABLE_TEST_LIB): $(REFTABLE_TEST_OBJS)
+ 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
+ 
  export DEFAULT_EDITOR DEFAULT_PAGER
  
  Documentation/GIT-EXCLUDED-PROGRAMS: FORCE