From 10f937dde8cca1a6446acf1bb9a68dfaf2388a39 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 13 Mar 2022 14:34:33 -0700
Subject: git: Update to 2.35.1

---
 pkg/git/.gitignore | 2 +-
 pkg/git/config.h   | 4 ++--
 pkg/git/sh_gen.sed | 2 --
 pkg/git/sha256     | 2 +-
 pkg/git/src        | 2 +-
 pkg/git/url        | 2 +-
 pkg/git/ver        | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'pkg')

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index 18cca0fc..4aff2236 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.34.1.tar.gz
+/git-manpages-2.35.1.tar.gz
 /man
 /man.ninja
diff --git a/pkg/git/config.h b/pkg/git/config.h
index 75ea1e75..fb92292f 100644
--- a/pkg/git/config.h
+++ b/pkg/git/config.h
@@ -3,7 +3,7 @@
 #define DEFAULT_PAGER ""
 #define ETC_GITATTRIBUTES "/etc/gitattributes"
 #define ETC_GITCONFIG "/etc/gitconfig"
-#define GIT_BUILT_FROM_COMMIT "b697d92f56511e804b8ba20ccbe7bdc85dc66810"
+#define GIT_BUILT_FROM_COMMIT "4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a"
 #define GIT_EXEC_PATH "libexec/git-core"
 #define GIT_HOST_CPU "unknown"
 #define GIT_HTML_PATH "share/doc/git-doc"
@@ -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.34.1"
+#define GIT_VERSION "2.35.1"
 #define HAVE_ALLOCA_H
 #define HAVE_PATHS_H
 #define HAVE_DEV_TTY
diff --git a/pkg/git/sh_gen.sed b/pkg/git/sh_gen.sed
index ea0f0f21..8cb88f96 100644
--- a/pkg/git/sh_gen.sed
+++ b/pkg/git/sh_gen.sed
@@ -1,10 +1,8 @@
 s|@SHELL_PATH@|/bin/sh|
 s|@@DIFF@@|diff|
 s|@@LOCALEDIR@@|/share/locale|g
-s|@@NO_CURL@@||g
 s|@@USE_GETTEXT_SCHEME@@||g
 /^\# @@BROKEN_PATH_FIX@@$/d
 s|@@GITWEBDIR@@|/share/gitweb|g
 s|@@PERL@@|/bin/perl|g
-s|@@SANE_TEXT_GREP@@||g
 s|@@PAGER_ENV@@|LESS=FRX LV=-c|g
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index a666e7c8..ca741f8b 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-220f1ed68582caeddf79c4db15e4eaa4808ec01fd11889e19232f0a74d7f31b0  git-manpages-2.34.1.tar.gz
+d90da8b28fe0088519e0dc3c9f4bc85e429c7d6ccbaadcfe94aed47fb9c95504  git-manpages-2.35.1.tar.gz
diff --git a/pkg/git/src b/pkg/git/src
index e9d7761b..4c53a8c2 160000
--- a/pkg/git/src
+++ b/pkg/git/src
@@ -1 +1 @@
-Subproject commit e9d7761bb94f20acc98824275e317fa82436c25d
+Subproject commit 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a
diff --git a/pkg/git/url b/pkg/git/url
index 04f1df1c..591f788f 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.34.1.tar.gz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.35.1.tar.gz"
diff --git a/pkg/git/ver b/pkg/git/ver
index 17556a9b..c7b0fab6 100644
--- a/pkg/git/ver
+++ b/pkg/git/ver
@@ -1 +1 @@
-2.34.1 r0
+2.35.1 r0
-- 
cgit v1.2.3