]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'hn/reftable'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:45 +0000 (09:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:45 +0000 (09:39 -0800)
The "reftable" backend for the refs API, without integrating into
the refs subsystem, has been added.

* 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

1  2 
Makefile
ci/lib.sh
config.mak.uname
configure.ac
contrib/buildsystems/CMakeLists.txt
object-file.c

diff --cc Makefile
index ed75ed422b506ab201f646248e03ad4026a3a10f,3d80975c706c50a01259857293fe95c9a1916efc..9c00a793e4701287f6e7b1007fc75111b09715a7
+++ 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
diff --cc ci/lib.sh
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
diff --cc object-file.c
Simple merge