From 07cb5a592199389495b03d8f12c55c831faf5c4f Mon Sep 17 00:00:00 2001
From: Randy Palamar <palamar@ualberta.ca>
Date: Tue, 3 Oct 2023 20:45:20 -0600
Subject: git: update to 2.42.0

---
 pkg/git/config.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkg/git/config.h')

diff --git a/pkg/git/config.h b/pkg/git/config.h
index 051f4bb5..cbabea58 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 "4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a"
+#define GIT_BUILT_FROM_COMMIT "43c8a30d150ecede9709c1f2527c8fba92c65f40"
 #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.37.3"
+#define GIT_VERSION "2.42.0"
 #define HAVE_ALLOCA_H
 #define HAVE_PATHS_H
 #define HAVE_DEV_TTY
@@ -30,7 +30,7 @@
 #define SHA1_DC
 #define SHA1DC_NO_STANDARD_INCLUDES
 #define SHA1DC_INIT_SAFE_HASH_DEFAULT 0
-#define SHA1DC_CUSTOM_INCLUDE_SHA1_C "cache.h"
+#define SHA1DC_CUSTOM_INCLUDE_SHA1_C "git-compat-util.h"
 #define SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C "git-compat-util.h"
 
 #define SHA256_BLK
-- 
cgit v1.2.3