git: Update to 2.34.0

10 files changed, 27 insertions, 14 deletions

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index a03aab59..cb4cde0d 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.32.0.tar.gz
+/git-manpages-2.34.0.tar.gz
 /man
 /man.ninja
diff --git a/pkg/git/commands.txt b/pkg/git/commands.txt
index ff52ed28..beb958ae 100644
--- a/pkg/git/commands.txt
+++ b/pkg/git/commands.txt
@@ -151,6 +151,7 @@ git-var.txt
 git-verify-commit.txt
 git-verify-pack.txt
 git-verify-tag.txt
+git-version.txt
 git-web--browse.txt
 git-whatchanged.txt
 git-worktree.txt
diff --git a/pkg/git/config.h b/pkg/git/config.h
index 4088719d..d1c9b9ee 100644
--- a/pkg/git/config.h
+++ b/pkg/git/config.h
@@ -11,7 +11,7 @@
 #define GIT_LOCALE_PATH "/share/locale"
 #define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.32.0"
+#define GIT_VERSION "2.34.0"
 #define HAVE_ALLOCA_H
 #define HAVE_PATHS_H
 #define HAVE_DEV_TTY
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
index 664c55fd..85a897b4 100644
--- a/pkg/git/gen.lua
+++ b/pkg/git/gen.lua
@@ -8,20 +8,27 @@ cflags{
 }
 
 pkg.deps = {
-	'$outdir/config-list.h',
 	'$outdir/command-list.h',
+	'$outdir/config-list.h',
+	'$outdir/hook-list.h',
 	'pkg/curl/headers',
 	'pkg/zlib/headers',
 }
 
 rule('cmdlist', 'cd $srcdir && ./generate-cmdlist.sh $$OLDPWD/$in >$$OLDPWD/$out')
 build('cmdlist', '$outdir/command-list.h', {
-	'$srcdir/command-list.txt', '|', expand{'$srcdir/Documentation/', lines('commands.txt')},
+	'$srcdir/command-list.txt',
+	'|', '$srcdir/generate-cmdlist.sh', expand{'$srcdir/Documentation/', lines('commands.txt')},
 })
 
-rule('configlist', 'cd $srcdir && ./generate-configlist.sh $$OLDPWD/$in >$$OLDPWD/$out')
+rule('configlist', 'cd $srcdir && ./generate-configlist.sh >$$OLDPWD/$out')
 build('configlist', '$outdir/config-list.h', {
-	'$srcdir/command-list.txt', '|', expand{'$srcdir/Documentation/', lines('configs.txt')},
+	'|', '$srcdir/generate-configlist.sh', expand{'$srcdir/Documentation/', lines('configs.txt')},
+})
+
+rule('hooklist', 'cd $srcdir && ./generate-hooklist.sh >$$OLDPWD/$out')
+build('hooklist', '$outdir/hook-list.h', {
+	'|', '$srcdir/generate-hooklist.sh', '$srcdir/Documentation/githooks.txt'
 })
 
 cc('exec-cmd.c', nil, {cflags=[[$cflags '-DFALLBACK_RUNTIME_PREFIX=""']]})
@@ -51,6 +58,7 @@ lib('libgit.a', [[
 	bulk-checkin.c
 	bundle.c
 	cache-tree.c
+	cbtree.c
 	chdir-notify.c
 	checkout.c
 	chunk-format.c
@@ -109,6 +117,7 @@ lib('libgit.a', [[
 	hashmap.c
 	help.c
 	hex.c
+	hook.c
 	ident.c
 	json-writer.c
 	kwset.c
@@ -148,6 +157,7 @@ lib('libgit.a', [[
 	oid-array.c
 	oidmap.c
 	oidset.c
+	oidtree.c
 	pack-bitmap-write.c
 	pack-bitmap.c
 	pack-check.c
@@ -272,6 +282,8 @@ lib('libgit.a', [[
 
 	sha256/block/sha256.c
 
+	compat/linux/procinfo.c
+
 	libxdiff.a
 	$builddir/pkg/zlib/libz.a
 ]])
@@ -450,7 +462,6 @@ local scripts = {
 
 	-- src/Makefile:/^SCRIPT_LIB.\+=
 	{'mergetool--lib', '644'},
-	{'rebase--preserve-merges', '644'},
 	{'sh-i18n', '644'},
 	{'sh-setup', '644'},
 }
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
index 52cd8e72..b2b3e6a7 100644
--- a/pkg/git/man.txt
+++ b/pkg/git/man.txt
@@ -149,6 +149,7 @@ man1/git-var.1
 man1/git-verify-commit.1
 man1/git-verify-pack.1
 man1/git-verify-tag.1
+man1/git-version.1
 man1/git-web--browse.1
 man1/git-whatchanged.1
 man1/git-worktree.1
diff --git a/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch b/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch
index 2fda11ca..c5af828d 100644
--- a/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch
+++ b/pkg/git/patch/0001-Enable-add.interactive.usebuiltin-by-default.patch
@@ -1,4 +1,4 @@
-From 56a6faa9119f2572c3638aaa9ccae3120d4ac790 Mon Sep 17 00:00:00 2001
+From dfb7c96e207a1c6d298d417c2e0b8fd79821d8d3 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 27 Jun 2020 01:09:58 -0700
 Subject: [PATCH] Enable add.interactive.usebuiltin by default
@@ -8,10 +8,10 @@ Subject: [PATCH] Enable add.interactive.usebuiltin by default
  1 file changed, 1 insertion(+)
 
 diff --git a/builtin/add.c b/builtin/add.c
-index ea762a41e3..456db07957 100644
+index ef6b619c45..c2b326abfd 100644
 --- a/builtin/add.c
 +++ b/builtin/add.c
-@@ -202,6 +202,7 @@ int run_add_interactive(const char *revision, const char *patch_mode,
+@@ -239,6 +239,7 @@ int run_add_interactive(const char *revision, const char *patch_mode,
  
  	if (use_builtin_add_i < 0) {
  		int experimental;
@@ -20,5 +20,5 @@ index ea762a41e3..456db07957 100644
  					 &use_builtin_add_i))
  			; /* ok */
 -- 
-2.30.1
+2.32.0
 
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index 56a7f51f..461d429b 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-b5533c40ea1688231c0e2df51cc0d1c0272e17fe78a45ba6e60cb8f61fa4a53c  git-manpages-2.32.0.tar.gz
+fe66a69244def488306c3e05c1362ea53d8626d2a7e57cd7311df2dab1ef8356  git-manpages-2.34.0.tar.gz
diff --git a/pkg/git/src b/pkg/git/src
-Subproject ebf3c04b262aa27fbb97f8a0156c2347fecafaf
+Subproject cd3e606211bb1cf8bc57f7d76bab98cc17a150b
diff --git a/pkg/git/url b/pkg/git/url
index 1598c4bc..72cfee46 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.32.0.tar.gz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.0.tar.gz"
diff --git a/pkg/git/ver b/pkg/git/ver
index 326fbb26..468dad23 100644
--- a/pkg/git/ver
+++ b/pkg/git/ver
@@ -1 +1 @@
-2.32.0 r0
+2.34.0 r0