git: Update to 2.31.1

8 files changed, 19 insertions, 16 deletions

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index bf4f576b..de060af5 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.30.1.tar.gz
+/git-manpages-2.31.1.tar.gz
 /man
 /man.ninja
diff --git a/pkg/git/config.h b/pkg/git/config.h
index 1f59539d..e949c78f 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.30.1"
+#define GIT_VERSION "2.31.1"
 #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 1b6deb5c..a925608b 100644
--- a/pkg/git/gen.lua
+++ b/pkg/git/gen.lua
@@ -53,6 +53,7 @@ lib('libgit.a', [[
 	cache-tree.c
 	chdir-notify.c
 	checkout.c
+	chunk-format.c
 	color.c
 	column.c
 	combine-diff.c
@@ -74,15 +75,17 @@ lib('libgit.a', [[
 	date.c
 	decorate.c
 	delta-islands.c
+	diff-delta.c
+	diff-merges.c
+	diff-lib.c
+	diff-no-index.c
+	diff.c
 	diffcore-break.c
 	diffcore-delta.c
 	diffcore-order.c
 	diffcore-pickaxe.c
 	diffcore-rename.c
-	diff-delta.c
-	diff-lib.c
-	diff-no-index.c
-	diff.c
+	diffcore-rotate.c
 	dir-iterator.c
 	dir.c
 	editor.c
@@ -102,6 +105,7 @@ lib('libgit.a', [[
 	gpg-interface.c
 	graph.c
 	grep.c
+	hash-lookup.c
 	hashmap.c
 	help.c
 	hex.c
@@ -138,6 +142,8 @@ lib('libgit.a', [[
 	notes-merge.c
 	notes-utils.c
 	notes.c
+	object-file.c
+	object-name.c
 	object.c
 	oid-array.c
 	oidmap.c
@@ -194,9 +200,6 @@ lib('libgit.a', [[
 	serve.c
 	server-info.c
 	setup.c
-	sha1-file.c
-	sha1-lookup.c
-	sha1-name.c
 	shallow.c
 	sideband.c
 	sigchain.c
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 b81b5135..2fda11ca 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 998329082e2fa9452c817fe6be6bcc908c13e8a7 Mon Sep 17 00:00:00 2001
+From 56a6faa9119f2572c3638aaa9ccae3120d4ac790 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 a825887c50..737ef23492 100644
+index ea762a41e3..456db07957 100644
 --- a/builtin/add.c
 +++ b/builtin/add.c
-@@ -194,6 +194,7 @@ int run_add_interactive(const char *revision, const char *patch_mode,
+@@ -202,6 +202,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 a825887c50..737ef23492 100644
  					 &use_builtin_add_i))
  			; /* ok */
 -- 
-2.28.0
+2.30.1
 
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index c9ab4da7..536f6cf5 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-db323e1b242e9d0337363b1e538c8b879e4c46eedbf94d3bee9e65dab6d49138  git-manpages-2.30.1.tar.gz
+d330498aaaea6928b0abbbbb896f6f605efd8d35f23cbbb2de38c87a737d4543  git-manpages-2.31.1.tar.gz
diff --git a/pkg/git/src b/pkg/git/src
-Subproject 773e25afc41b1b6533fa9ae2cd825d0b4a697fa
+Subproject 48bf2fa8bad054d66bd79c6ba903c89c704201f
diff --git a/pkg/git/url b/pkg/git/url
index b0e01973..b6c7bdbe 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.30.1.tar.gz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.31.1.tar.gz"
diff --git a/pkg/git/ver b/pkg/git/ver
index 96f8fd20..7b22094a 100644
--- a/pkg/git/ver
+++ b/pkg/git/ver
@@ -1 +1 @@
-2.30.1 r0
+2.31.1 r0