git: Update to 2.14.0

9 files changed, 15 insertions, 11 deletions

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index ae2c1f6b..963e8471 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.13.4.tar.xz
+/git-manpages-2.14.0.tar.xz
 /man
 /man.ninja
diff --git a/pkg/git/config.h b/pkg/git/config.h
index 66160c62..5c8da826 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.13.4"
+#define GIT_VERSION "2.14.0"
 #define PAGER_ENV "LESS=FRX LV=-c"
 #define NO_SYS_POLL_H
 #define NO_OPENSSL
diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc
index f5a62f6b..b71cdb0b 100644
--- a/pkg/git/gen.rc
+++ b/pkg/git/gen.rc
@@ -30,6 +30,7 @@ lib libgit.a -d '$dir'/deps\
 	attr.c\
 	base85.c\
 	bisect.c\
+	blame.c\
 	blob.c\
 	branch.c\
 	bulk-checkin.c\
@@ -135,6 +136,7 @@ lib libgit.a -d '$dir'/deps\
 	refs/ref-cache.c\
 	remote.c\
 	replace_object.c\
+	repository.c\
 	rerere.c\
 	resolve-undo.c\
 	revision.c\
@@ -156,6 +158,7 @@ lib libgit.a -d '$dir'/deps\
 	string-list.c\
 	submodule-config.c\
 	submodule.c\
+	sub-process.c\
 	symlinks.c\
 	tag.c\
 	tempfile.c\
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
index b9efadc6..5d426f81 100644
--- a/pkg/git/man.txt
+++ b/pkg/git/man.txt
@@ -1,4 +1,4 @@
-# 2,<xzcat git-manpages-2.13.4.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
+# 2,<xzcat git-manpages-2.14.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
 man1/git-add.1
 man1/git-am.1
 man1/git-annotate.1
@@ -165,6 +165,7 @@ man7/giteveryday.7
 man7/gitglossary.7
 man7/gitnamespaces.7
 man7/gitrevisions.7
+man7/gitsubmodules.7
 man7/gittutorial-2.7
 man7/gittutorial.7
 man7/gitworkflows.7
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 063fe58c..c5fe5e69 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 49e7a40ddc34263816f46144a0d5944e7b6b1dc0 Mon Sep 17 00:00:00 2001
+From 04ab5cf17fdc9252910817a1e1e73900239b18ed 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 c0d0e9a4c..32c880377 100755
+index e131760ee..ffa2d6648 100755
 --- a/git-submodule.sh
 +++ b/git-submodule.sh
-@@ -863,7 +863,7 @@ cmd_summary() {
+@@ -864,7 +864,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 c0d0e9a4c..32c880377 100755
  			printf '%s\n' "$sm_path"
  		done
  	)
-@@ -897,11 +897,11 @@ cmd_summary() {
+@@ -898,11 +898,11 @@ cmd_summary() {
  		missing_dst=
  
  		test $mod_src = 160000 &&
@@ -103,5 +103,5 @@ index c0d0e9a4c..32c880377 100755
  
  		display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
 -- 
-2.12.2
+2.13.4
 
diff --git a/pkg/git/rev b/pkg/git/rev
index 3c032078..d6b24041 100644
--- a/pkg/git/rev
+++ b/pkg/git/rev
@@ -1 +1 @@
-18
+19
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index f75e7e98..f522ecbb 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-674fa9a299cbcb91e49affd7dfd69952be1ee88cb7a3d5ee5b294e7da29b5d52  git-manpages-2.13.4.tar.xz
+7d653c68a27eb7878ad92c0ab4d4fbcf112b69b67d4c8a180779651a96b1824d  git-manpages-2.14.0.tar.xz
diff --git a/pkg/git/src b/pkg/git/src
-Subproject cf8899d285d2648013040ec7196ffd3de060666
+Subproject 4384e3cde2ce8ecd194202e171ae16333d24132
diff --git a/pkg/git/url b/pkg/git/url
index 072352cd..e54f60fa 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.13.4.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.14.0.tar.xz"