Update git-core to v2.46.1

glandium · Sep 18, 2024 · aae97ec · aae97ec
1 parent b4e859f
commit aae97ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/CI/tools.py b/CI/tools.py
@@ -17,9 +17,7 @@
 from variables import TC_BRANCH, TC_IS_PUSH
 
 MERCURIAL_VERSION = "6.8"
-# Not using 2.46.0 because of
-# https://lore.kernel.org/git/20240727191917.p64ul4jybpm2a7hm@glandium.org/
-GIT_VERSION = "2.45.2"
+GIT_VERSION = "2.46.1"
 
 ALL_MERCURIAL_VERSIONS = (
     "1.9.3",

diff --git a/git-core b/git-core
diff --git a/src/csum-file.c.patch b/src/csum-file.c.patch
@@ -1,9 +1,9 @@
 diff --git a/csum-file.c b/csum-file.c
-index 59ef3398ca..46f753d012 100644
+index 2131ee6b12..f31d551613 100644
 --- a/csum-file.c
 +++ b/csum-file.c
-@@ -92,7 +92,8 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result,
- 	return fd;
+@@ -111,7 +111,8 @@ void discard_hashfile(struct hashfile *f)
+ 	free_hashfile(f);
  }
 
 -void hashwrite(struct hashfile *f, const void *buf, unsigned int count)