git: Update to 2.13.0

8 files changed, 14 insertions, 11 deletions

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index a5e984b3..3fd99b8c 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.12.2.tar.xz
+/git-manpages-2.13.0.tar.xz
 /man
 /man.ninja
diff --git a/pkg/git/config.h b/pkg/git/config.h
index 215f5311..ca107532 100644
--- a/pkg/git/config.h
+++ b/pkg/git/config.h
@@ -9,7 +9,7 @@
 #define GIT_LOCALE_PATH "/share/locale"
 #define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.12.2"
+#define GIT_VERSION "2.13.0"
 #define NO_SYS_POLL_H
 #define PAGER_ENV "LESS=FRX LV=-c"
-#define SHA1_HEADER <openssl/sha.h>
+#define SHA1_OPENSSL
diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc
index c0331d3d..92b13aa7 100644
--- a/pkg/git/gen.rc
+++ b/pkg/git/gen.rc
@@ -104,6 +104,7 @@ lib libgit.a -d '$dir'/deps\
 	notes-utils.c\
 	notes.c\
 	object.c\
+	oidset.c\
 	pack-bitmap-write.c\
 	pack-bitmap.c\
 	pack-check.c\
@@ -131,6 +132,7 @@ lib libgit.a -d '$dir'/deps\
 	refs.c\
 	refs/files-backend.c\
 	refs/iterator.c\
+	refs/ref-cache.c\
 	remote.c\
 	replace_object.c\
 	rerere.c\
@@ -272,6 +274,7 @@ exe git -d '$dir'/deps git.c common-main.c.o builtin/^(\
 	pull.c\
 	push.c\
 	read-tree.c\
+	rebase--helper.c\
 	receive-pack.c\
 	reflog.c\
 	remote.c\
diff --git a/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch b/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
index d8cc85d9..063fe58c 100644
--- a/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
+++ b/pkg/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
@@ -1,4 +1,4 @@
-From 11e58a3bbbc2c266ea6c3d3a6bd05c860b56ecbc Mon Sep 17 00:00:00 2001
+From 49e7a40ddc34263816f46144a0d5944e7b6b1dc0 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 3 Dec 2016 00:41:41 -0800
 Subject: [PATCH] Drop dashes from builtin invocations in scripts
@@ -76,10 +76,10 @@ index d3c39980f..dcfa27177 100644
  GIT_DIR=$(git rev-parse -q --git-dir) || :;
  
 diff --git a/git-submodule.sh b/git-submodule.sh
-index 136e26a2c..abcb03a0c 100755
+index c0d0e9a4c..32c880377 100755
 --- a/git-submodule.sh
 +++ b/git-submodule.sh
-@@ -849,7 +849,7 @@ cmd_summary() {
+@@ -863,7 +863,7 @@ cmd_summary() {
  				test $status != A && test $ignore_config = all && continue
  			fi
  			# Also show added or modified modules which are checked out
@@ -88,7 +88,7 @@ index 136e26a2c..abcb03a0c 100755
  			printf '%s\n' "$sm_path"
  		done
  	)
-@@ -883,11 +883,11 @@ cmd_summary() {
+@@ -897,11 +897,11 @@ cmd_summary() {
  		missing_dst=
  
  		test $mod_src = 160000 &&
@@ -103,5 +103,5 @@ index 136e26a2c..abcb03a0c 100755
  
  		display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
 -- 
-2.11.1
+2.12.2
 
diff --git a/pkg/git/rev b/pkg/git/rev
index b1bd38b6..8351c193 100644
--- a/pkg/git/rev
+++ b/pkg/git/rev
@@ -1 +1 @@
-13
+14
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index 6fa742e1..8478d390 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-7ed1da04e6b0f7fb54a3c7546c6a30fe999b5c8ffcf5e3418521e7550b7f9558  git-manpages-2.12.2.tar.xz
+8414f9c62e2b099cd0ea2ca22c55fb6538b13fc7a3ed1508fb9881aae42a97c9  git-manpages-2.13.0.tar.xz
diff --git a/pkg/git/src b/pkg/git/src
-Subproject 8f9aeb0d36c6cbfb849946bb272fa0d3c461154
+Subproject b06d3643105c8758ed019125a4399cb7efdcce2
diff --git a/pkg/git/url b/pkg/git/url
index a178e849..b39235af 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.12.2.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.13.0.tar.xz"