git: update to 2.42.0

oasislinux · Oct 4, 2023 · 4443276 · 4443276
1 parent 2870f50
commit 4443276
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 15 deletions.
diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt
@@ -38,6 +38,7 @@ git-cvsimport.txt
 git-cvsserver.txt
 git-daemon.txt
 git-describe.txt
+git-diagnose.txt
 git-diff-files.txt
 git-diff-index.txt
 git-diff-tree.txt
@@ -167,13 +168,24 @@ gitcvs-migration.txt
 gitdiffcore.txt
 giteveryday.txt
 gitfaq.txt
+gitformat-bundle.txt
+gitformat-chunk.txt
+gitformat-commit-graph.txt
+gitformat-index.txt
+gitformat-pack.txt
+gitformat-signature.txt
 gitglossary.txt
 githooks.txt
 gitignore.txt
 gitk.txt
 gitmailmap.txt
 gitmodules.txt
 gitnamespaces.txt
+gitprotocol-capabilities.txt
+gitprotocol-common.txt
+gitprotocol-http.txt
+gitprotocol-pack.txt
+gitprotocol-v2.txt
 gitremote-helpers.txt
 gitrepository-layout.txt
 gitrevisions.txt

diff --git a/pkg/git/config.h b/pkg/git/config.h
@@ -3,15 +3,15 @@
 #define DEFAULT_PAGER ""
 #define ETC_GITATTRIBUTES "/etc/gitattributes"
 #define ETC_GITCONFIG "/etc/gitconfig"
-#define GIT_BUILT_FROM_COMMIT "4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a"
+#define GIT_BUILT_FROM_COMMIT "43c8a30d150ecede9709c1f2527c8fba92c65f40"
 #define GIT_EXEC_PATH "libexec/git-core"
 #define GIT_HOST_CPU "unknown"
 #define GIT_HTML_PATH "share/doc/git-doc"
 #define GIT_INFO_PATH "share/info"
 #define GIT_LOCALE_PATH "/share/locale"
 #define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.37.3"
+#define GIT_VERSION "2.42.0"
 #define HAVE_ALLOCA_H
 #define HAVE_PATHS_H
 #define HAVE_DEV_TTY
@@ -30,7 +30,7 @@
 #define SHA1_DC
 #define SHA1DC_NO_STANDARD_INCLUDES
 #define SHA1DC_INIT_SAFE_HASH_DEFAULT 0
-#define SHA1DC_CUSTOM_INCLUDE_SHA1_C "cache.h"
+#define SHA1DC_CUSTOM_INCLUDE_SHA1_C "git-compat-util.h"
 #define SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C "git-compat-util.h"
 
 #define SHA256_BLK
diff --git a/pkg/git/configs.txt b/pkg/git/configs.txt
@@ -9,6 +9,7 @@ config/apply.txt
 config/blame.txt
 config/branch.txt
 config/browser.txt
+config/bundle.txt
 config/checkout.txt
 config/clean.txt
 config/clone.txt
@@ -29,6 +30,7 @@ config/filter.txt
 config/fmt-merge-msg.txt
 config/format.txt
 config/fsck.txt
+config/fsmonitor--daemon.txt
 config/gc.txt
 config/gitcvs.txt
 config/gitweb.txt

diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
@@ -56,6 +56,7 @@ lib('libgit.a', [[
 	bloom.c
 	branch.c
 	bulk-checkin.c
+	bundle-uri.c
 	bundle.c
 	cache-tree.c
 	cbtree.c
@@ -68,11 +69,12 @@ lib('libgit.a', [[
 	commit-graph.c
 	commit-reach.c
 	commit.c
+	compat/nonblock.c
 	compat/obstack.c
+	compat/qsort_s.c
 	compat/regex/regex.c.o
 	compat/terminal.c
 	compat/zlib-uncompress2.c
-	compat/qsort_s.c
 	config.c
 	connect.c
 	connected.c
@@ -84,6 +86,7 @@ lib('libgit.a', [[
 	date.c
 	decorate.c
 	delta-islands.c
+	diagnose.c
 	diff-delta.c
 	diff-merges.c
 	diff-lib.c
@@ -113,6 +116,7 @@ lib('libgit.a', [[
 	fsmonitor-ipc.c
 	fsmonitor-settings.c
 	gettext.c
+	git-zlib.c
 	gpg-interface.c
 	graph.c
 	grep.c
@@ -131,20 +135,19 @@ lib('libgit.a', [[
 	list-objects-filter-options.c
 	list-objects-filter.c
 	list-objects.c
-	ll-merge.c
 	lockfile.c
 	log-tree.c
 	ls-refs.c
 	mailinfo.c
 	mailmap.c
 	match-trees.c
 	mem-pool.c
-	merge.c
 	merge-blobs.c
+	merge-ll.c
 	merge-ort.c
 	merge-ort-wrappers.c
 	merge-recursive.c
-	mergesort.c
+	merge.c
 	midx.c
 	name-hash.c
 	negotiator/default.c
@@ -223,6 +226,7 @@ lib('libgit.a', [[
 	sparse-index.c
 	split-index.c
 	stable-qsort.c
+	statinfo.c
 	strbuf.c
 	streaming.c
 	string-list.c
@@ -241,6 +245,7 @@ lib('libgit.a', [[
 	trace2/(
 		tr2_cfg.c
 		tr2_cmd_name.c
+		tr2_ctr.c
 		tr2_dst.c
 		tr2_sid.c
 		tr2_sysenv.c
@@ -249,6 +254,7 @@ lib('libgit.a', [[
 		tr2_tgt_normal.c
 		tr2_tgt_perf.c
 		tr2_tls.c
+		tr2_tmr.c
 	)
 	trailer.c
 	transport-helper.c
@@ -274,7 +280,6 @@ lib('libgit.a', [[
 	ws.c
 	wt-status.c
 	xdiff-interface.c
-	zlib.c
 
 	unix-socket.c
 	unix-stream-server.c
@@ -311,7 +316,7 @@ local builtins = {
 	'annotate',
 	'apply',
 	'archive',
-	'bisect--helper',
+	'bisect',
 	'blame',
 	'branch',
 	'bugreport',
@@ -321,8 +326,8 @@ local builtins = {
 	'check-ignore',
 	'check-mailmap',
 	'check-ref-format',
-	'checkout-index',
 	'checkout--worker',
+	'checkout-index',
 	'checkout',
 	'clean',
 	'clone',
@@ -337,12 +342,12 @@ local builtins = {
 	'credential-store',
 	'credential',
 	'describe',
+	'diagnose',
 	'diff-files',
 	'diff-index',
 	'diff-tree',
 	'diff',
 	'difftool',
-	'env--helper',
 	'fast-export',
 	'fast-import',
 	'fetch-pack',
@@ -455,7 +460,6 @@ end
 
 local scripts = {
 	-- src/Makefile:/^SCRIPT_SH.\+=
-	{'bisect', '755'},
 	{'difftool--helper', '755'},
 	{'filter-branch', '755'},
 	{'merge-octopus', '755'},

diff --git a/pkg/git/man.txt b/pkg/git/man.txt
@@ -37,6 +37,7 @@ man1/git-cvsimport.1
 man1/git-cvsserver.1
 man1/git-daemon.1
 man1/git-describe.1
+man1/git-diagnose.1
 man1/git-diff-files.1
 man1/git-diff-index.1
 man1/git-diff-tree.1
@@ -159,11 +160,23 @@ man1/git-write-tree.1
 man1/git.1
 man1/gitk.1
 man1/gitweb.1
+man1/scalar.1
 man5/gitattributes.5
+man5/gitformat-bundle.5
+man5/gitformat-chunk.5
+man5/gitformat-commit-graph.5
+man5/gitformat-index.5
+man5/gitformat-pack.5
+man5/gitformat-signature.5
 man5/githooks.5
 man5/gitignore.5
 man5/gitmailmap.5
 man5/gitmodules.5
+man5/gitprotocol-capabilities.5
+man5/gitprotocol-common.5
+man5/gitprotocol-http.5
+man5/gitprotocol-pack.5
+man5/gitprotocol-v2.5
 man5/gitrepository-layout.5
 man5/gitweb.conf.5
 man7/gitcli.7

diff --git a/pkg/git/sha256 b/pkg/git/sha256
@@ -1 +1 @@
-ea04396fa3487ee92b0e2f4a1f2339135ba8b741a0c18a2db1c9f435d0a2c05d  git-manpages-2.37.3.tar.gz
+51643c53d70ce15dde83b6da2bad76ba0c7bbcd4f944d7c378f03a15b9f2e1de  git-manpages-2.42.0.tar.gz
diff --git a/pkg/git/src b/pkg/git/src
diff --git a/pkg/git/url b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.37.3.tar.gz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.42.0.tar.gz"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ea04396fa3487ee92b0e2f4a1f2339135ba8b741a0c18a2db1c9f435d0a2c05d git-manpages-2.37.3.tar.gz
		51643c53d70ce15dde83b6da2bad76ba0c7bbcd4f944d7c378f03a15b9f2e1de git-manpages-2.42.0.tar.gz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.37.3.tar.gz"
		url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.42.0.tar.gz"