merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
Vincent Ambo
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
80
third_party/git/Makefile
vendored
80
third_party/git/Makefile
vendored
|
|
@ -34,13 +34,8 @@ all::
|
|||
# library. Support for version 1 will likely be removed in some future
|
||||
# release of Git, as upstream has all but abandoned it.
|
||||
#
|
||||
# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if the PCRE v1
|
||||
# library is compiled without --enable-jit. We will auto-detect
|
||||
# whether the version of the PCRE v1 library in use has JIT support at
|
||||
# all, but we unfortunately can't auto-detect whether JIT support
|
||||
# hasn't been compiled in in an otherwise JIT-supporting version. If
|
||||
# you have link-time errors about a missing `pcre_jit_exec` define
|
||||
# this, or recompile PCRE v1 with --enable-jit.
|
||||
# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if you want to
|
||||
# disable JIT even if supported by your library.
|
||||
#
|
||||
# Define LIBPCREDIR=/foo/bar if your PCRE header and library files are
|
||||
# in /foo/bar/include and /foo/bar/lib directories. Which version of
|
||||
|
|
@ -486,7 +481,7 @@ all::
|
|||
#
|
||||
# When DEVELOPER is set, DEVOPTS can be used to control compiler
|
||||
# options. This variable contains keywords separated by
|
||||
# whitespace. The following keywords are are recognized:
|
||||
# whitespace. The following keywords are recognized:
|
||||
#
|
||||
# no-error:
|
||||
#
|
||||
|
|
@ -598,6 +593,7 @@ SCRIPT_SH =
|
|||
SCRIPT_LIB =
|
||||
TEST_BUILTINS_OBJS =
|
||||
TEST_PROGRAMS_NEED_X =
|
||||
THIRD_PARTY_SOURCES =
|
||||
|
||||
# Having this variable in your environment would break pipelines because
|
||||
# you cause "cd" to echo its destination to stdout. It can also take
|
||||
|
|
@ -725,11 +721,14 @@ TEST_BUILTINS_OBJS += test-mktemp.o
|
|||
TEST_BUILTINS_OBJS += test-oidmap.o
|
||||
TEST_BUILTINS_OBJS += test-online-cpus.o
|
||||
TEST_BUILTINS_OBJS += test-parse-options.o
|
||||
TEST_BUILTINS_OBJS += test-parse-pathspec-file.o
|
||||
TEST_BUILTINS_OBJS += test-path-utils.o
|
||||
TEST_BUILTINS_OBJS += test-pkt-line.o
|
||||
TEST_BUILTINS_OBJS += test-prio-queue.o
|
||||
TEST_BUILTINS_OBJS += test-progress.o
|
||||
TEST_BUILTINS_OBJS += test-reach.o
|
||||
TEST_BUILTINS_OBJS += test-read-cache.o
|
||||
TEST_BUILTINS_OBJS += test-read-graph.o
|
||||
TEST_BUILTINS_OBJS += test-read-midx.o
|
||||
TEST_BUILTINS_OBJS += test-ref-store.o
|
||||
TEST_BUILTINS_OBJS += test-regex.o
|
||||
|
|
@ -818,14 +817,16 @@ VCSSVN_LIB = vcs-svn/lib.a
|
|||
|
||||
GENERATED_H += command-list.h
|
||||
|
||||
LIB_H := $(sort $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
|
||||
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
|
||||
$(FIND) . \
|
||||
-name .git -prune -o \
|
||||
-name t -prune -o \
|
||||
-name Documentation -prune -o \
|
||||
-name '*.h' -print))
|
||||
-name '*.h' -print)))
|
||||
|
||||
LIB_OBJS += abspath.o
|
||||
LIB_OBJS += add-interactive.o
|
||||
LIB_OBJS += add-patch.o
|
||||
LIB_OBJS += advice.o
|
||||
LIB_OBJS += alias.o
|
||||
LIB_OBJS += alloc.o
|
||||
|
|
@ -884,7 +885,6 @@ LIB_OBJS += ewah/ewah_io.o
|
|||
LIB_OBJS += ewah/ewah_rlw.o
|
||||
LIB_OBJS += exec-cmd.o
|
||||
LIB_OBJS += fetch-negotiator.o
|
||||
LIB_OBJS += fetch-object.o
|
||||
LIB_OBJS += fetch-pack.o
|
||||
LIB_OBJS += fsck.o
|
||||
LIB_OBJS += fsmonitor.o
|
||||
|
|
@ -948,12 +948,14 @@ LIB_OBJS += preload-index.o
|
|||
LIB_OBJS += pretty.o
|
||||
LIB_OBJS += prio-queue.o
|
||||
LIB_OBJS += progress.o
|
||||
LIB_OBJS += promisor-remote.o
|
||||
LIB_OBJS += prompt.o
|
||||
LIB_OBJS += protocol.o
|
||||
LIB_OBJS += quote.o
|
||||
LIB_OBJS += range-diff.o
|
||||
LIB_OBJS += reachable.o
|
||||
LIB_OBJS += read-cache.o
|
||||
LIB_OBJS += rebase.o
|
||||
LIB_OBJS += rebase-interactive.o
|
||||
LIB_OBJS += reflog-walk.o
|
||||
LIB_OBJS += refs.o
|
||||
|
|
@ -965,6 +967,7 @@ LIB_OBJS += refspec.o
|
|||
LIB_OBJS += ref-filter.o
|
||||
LIB_OBJS += remote.o
|
||||
LIB_OBJS += replace-object.o
|
||||
LIB_OBJS += repo-settings.o
|
||||
LIB_OBJS += repository.o
|
||||
LIB_OBJS += rerere.o
|
||||
LIB_OBJS += resolve-undo.o
|
||||
|
|
@ -983,6 +986,7 @@ LIB_OBJS += shallow.o
|
|||
LIB_OBJS += sideband.o
|
||||
LIB_OBJS += sigchain.o
|
||||
LIB_OBJS += split-index.o
|
||||
LIB_OBJS += stable-qsort.o
|
||||
LIB_OBJS += strbuf.o
|
||||
LIB_OBJS += streaming.o
|
||||
LIB_OBJS += string-list.o
|
||||
|
|
@ -1126,6 +1130,7 @@ BUILTIN_OBJS += builtin/shortlog.o
|
|||
BUILTIN_OBJS += builtin/show-branch.o
|
||||
BUILTIN_OBJS += builtin/show-index.o
|
||||
BUILTIN_OBJS += builtin/show-ref.o
|
||||
BUILTIN_OBJS += builtin/sparse-checkout.o
|
||||
BUILTIN_OBJS += builtin/stash.o
|
||||
BUILTIN_OBJS += builtin/stripspace.o
|
||||
BUILTIN_OBJS += builtin/submodule--helper.o
|
||||
|
|
@ -1145,6 +1150,20 @@ BUILTIN_OBJS += builtin/verify-tag.o
|
|||
BUILTIN_OBJS += builtin/worktree.o
|
||||
BUILTIN_OBJS += builtin/write-tree.o
|
||||
|
||||
# THIRD_PARTY_SOURCES is a list of patterns compatible with the
|
||||
# $(filter) and $(filter-out) family of functions. They specify source
|
||||
# files which are taken from some third-party source where we want to be
|
||||
# less strict about issues such as coding style so we don't diverge from
|
||||
# upstream unnecessarily (making merging in future changes easier).
|
||||
THIRD_PARTY_SOURCES += compat/inet_ntop.c
|
||||
THIRD_PARTY_SOURCES += compat/inet_pton.c
|
||||
THIRD_PARTY_SOURCES += compat/nedmalloc/%
|
||||
THIRD_PARTY_SOURCES += compat/obstack.%
|
||||
THIRD_PARTY_SOURCES += compat/poll/%
|
||||
THIRD_PARTY_SOURCES += compat/regex/%
|
||||
THIRD_PARTY_SOURCES += sha1collisiondetection/%
|
||||
THIRD_PARTY_SOURCES += sha1dc/%
|
||||
|
||||
GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
|
||||
EXTLIBS =
|
||||
|
||||
|
|
@ -1203,6 +1222,9 @@ endif
|
|||
ifneq ($(filter leak,$(SANITIZERS)),)
|
||||
BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
|
||||
endif
|
||||
ifneq ($(filter address,$(SANITIZERS)),)
|
||||
NO_REGEX = NeededForASAN
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef sysconfdir
|
||||
|
|
@ -1714,7 +1736,6 @@ ifdef NO_GETPAGESIZE
|
|||
endif
|
||||
ifdef INTERNAL_QSORT
|
||||
COMPAT_CFLAGS += -DINTERNAL_QSORT
|
||||
COMPAT_OBJS += compat/qsort.o
|
||||
endif
|
||||
ifdef HAVE_ISO_QSORT_S
|
||||
COMPAT_CFLAGS += -DHAVE_ISO_QSORT_S
|
||||
|
|
@ -1871,8 +1892,9 @@ ifndef V
|
|||
QUIET_MSGFMT = @echo ' ' MSGFMT $@;
|
||||
QUIET_GCOV = @echo ' ' GCOV $@;
|
||||
QUIET_SP = @echo ' ' SP $<;
|
||||
QUIET_HDR = @echo ' ' HDR $<;
|
||||
QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
|
||||
QUIET_RC = @echo ' ' RC $@;
|
||||
QUIET_SPATCH = @echo ' ' SPATCH $<;
|
||||
QUIET_SUBDIR0 = +@subdir=
|
||||
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
|
||||
$(MAKE) $(PRINT_DIR) -C $$subdir
|
||||
|
|
@ -2599,6 +2621,7 @@ FIND_SOURCE_FILES = ( \
|
|||
-o \( -name 'trash*' -type d -prune \) \
|
||||
-o \( -name '*.[hcS]' -type f -print \) \
|
||||
-o \( -name '*.sh' -type f -print \) \
|
||||
| sed -e 's|^\./||' \
|
||||
)
|
||||
|
||||
$(ETAGS_TARGET): FORCE
|
||||
|
|
@ -2763,16 +2786,20 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
|
|||
.PHONY: sparse $(SP_OBJ)
|
||||
sparse: $(SP_OBJ)
|
||||
|
||||
GEN_HDRS := command-list.h unicode-width.h
|
||||
EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/%
|
||||
EXCEPT_HDRS := command-list.h unicode-width.h compat/% xdiff/%
|
||||
ifndef GCRYPT_SHA256
|
||||
EXCEPT_HDRS += sha256/gcrypt.h
|
||||
endif
|
||||
CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H)))
|
||||
CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H))
|
||||
HCO = $(patsubst %.h,%.hco,$(CHK_HDRS))
|
||||
HCC = $(HCO:hco=hcc)
|
||||
|
||||
$(HCO): %.hco: %.h FORCE
|
||||
$(QUIET_HDR)$(CC) -include git-compat-util.h -I. -o /dev/null -c -xc $<
|
||||
%.hcc: %.h
|
||||
@echo '#include "git-compat-util.h"' >$@
|
||||
@echo '#include "$<"' >>$@
|
||||
|
||||
$(HCO): %.hco: %.hcc FORCE
|
||||
$(QUIET_HDR)$(CC) $(ALL_CFLAGS) -o /dev/null -c -xc $<
|
||||
|
||||
.PHONY: hdr-check $(HCO)
|
||||
hdr-check: $(HCO)
|
||||
|
|
@ -2791,15 +2818,11 @@ check: command-list.h
|
|||
exit 1; \
|
||||
fi
|
||||
|
||||
C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ))
|
||||
ifdef DC_SHA1_SUBMODULE
|
||||
COCCI_SOURCES = $(filter-out sha1collisiondetection/%,$(C_SOURCES))
|
||||
else
|
||||
COCCI_SOURCES = $(filter-out sha1dc/%,$(C_SOURCES))
|
||||
endif
|
||||
FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES)))
|
||||
COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES))
|
||||
|
||||
%.cocci.patch: %.cocci $(COCCI_SOURCES)
|
||||
@echo ' ' SPATCH $<; \
|
||||
$(QUIET_SPATCH) \
|
||||
if test $(SPATCH_BATCH_SIZE) = 0; then \
|
||||
limit=; \
|
||||
else \
|
||||
|
|
@ -3028,6 +3051,10 @@ rpm::
|
|||
@false
|
||||
.PHONY: rpm
|
||||
|
||||
ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),)
|
||||
OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll)
|
||||
endif
|
||||
|
||||
artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
|
||||
GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
|
||||
$(MOFILES)
|
||||
|
|
@ -3081,9 +3108,10 @@ clean: profile-clean coverage-clean cocciclean
|
|||
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
|
||||
$(RM) $(TEST_PROGRAMS)
|
||||
$(RM) $(FUZZ_PROGRAMS)
|
||||
$(RM) $(HCC)
|
||||
$(RM) -r bin-wrappers $(dep_dirs)
|
||||
$(RM) -r po/build/
|
||||
$(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope*
|
||||
$(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope*
|
||||
$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
|
||||
$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
|
||||
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue