Update git-core to 2.51.0

Author: glandium

CI/tools.py

@@ -16,7 +16,7 @@
 from util import build_commit
 
 MERCURIAL_VERSION = "6.9.1"
-GIT_VERSION = "2.50.1"
+GIT_VERSION = "2.51.0"
 
 ALL_MERCURIAL_VERSIONS = (
     "1.9.3",

git-core

@@ -276,9 +276,9 @@ void do_set_replace(const struct object_id *replaced,
 	}
 }
 
-int write_object_file_flags(const void *buf, size_t len, enum object_type type,
-                            struct object_id *oid, struct object_id *compat_oid_in UNUSED,
-                            unsigned flags UNUSED)
+int write_object_file(struct odb_source *source UNUSED, const void *buf, size_t len,
+		      enum object_type type, struct object_id *oid,
+		      struct object_id *compat_oid_in UNUSED, unsigned flags UNUSED)
 {
 	struct strslice data;
 	data.buf = (void *)buf;

src/cinnabar-fast-import.c

@@ -225,7 +225,7 @@ static void init_git_config(void)
 static void cleanup_git_config(int nongit)
 {
 	const char *value;
-	if (!git_config_get_value("cinnabar.fsck", &value)) {
+	if (!repo_config_get_value(the_repository, "cinnabar.fsck", &value)) {
 		// We used to set cinnabar.fsck globally, then locally.
 		// Remove both.
 		char *user_config, *xdg_config;
@@ -235,23 +235,23 @@ static void cleanup_git_config(int nongit)
 				xdg_config &&
 				!access_or_warn(xdg_config, R_OK, 0))
 			{
-				git_config_set_in_file_gently(
-					xdg_config, "cinnabar.fsck", NULL,
-					NULL);
+				repo_config_set_in_file_gently(
+					the_repository, xdg_config,
+					"cinnabar.fsck", NULL, NULL);
 			} else {
-				git_config_set_in_file_gently(
-					user_config, "cinnabar.fsck", NULL,
-					NULL);
+				repo_config_set_in_file_gently(
+					the_repository, user_config,
+					"cinnabar.fsck", NULL, NULL);
 			}
 		}
 		free(user_config);
 		free(xdg_config);
 		if (!nongit) {
 			user_config = repo_git_path(the_repository, "config");
 			if (user_config) {
-				git_config_set_in_file_gently(
-					user_config, "cinnabar.fsck", NULL,
-					NULL);
+				repo_config_set_in_file_gently(
+					the_repository, user_config,
+					"cinnabar.fsck", NULL, NULL);
 			}
 			free(user_config);
 		}
@@ -389,7 +389,7 @@ int init_cinnabar(const char *argv0)
 
 	init_git_config();
 	setup_git_directory_gently(&nongit);
-	git_config(git_diff_basic_config, NULL);
+	repo_config(the_repository, git_diff_basic_config, NULL);
 	cleanup_git_config(nongit);
 	save_commit_buffer = 0;
 	warn_on_object_refname_ambiguity = 0;

src/cinnabar-helper.c

@@ -1,16 +1,16 @@
 diff --git a/builtin/fast-import.c b/builtin/fast-import.c
-index b2839c5f43..1feeaf0ec1 100644
+index adf3994be1..bb74f33110 100644
 --- a/builtin/fast-import.c
 +++ b/builtin/fast-import.c
-@@ -29,6 +29,7 @@
- #include "commit-reach.h"
+@@ -30,6 +30,7 @@
  #include "khash.h"
  #include "date.h"
+ #include "gpg-interface.h"
 +#include "shallow.h"
 
  #define PACK_ID_BITS 16
  #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
-@@ -757,7 +758,7 @@ static struct tree_content *dup_tree_content(struct tree_content *s)
+@@ -758,7 +759,7 @@ static struct tree_content *dup_tree_content(struct tree_content *s)
  	return d;
  }
 
@@ -19,7 +19,7 @@ index b2839c5f43..1feeaf0ec1 100644
  {
  	struct strbuf tmp_file = STRBUF_INIT;
  	struct packed_git *p;
-@@ -860,7 +861,7 @@ static int loosen_small_pack(const struct packed_git *p)
+@@ -862,7 +863,7 @@ static int loosen_small_pack(const struct packed_git *p)
  	return run_command(&unpack);
  }
 
@@ -28,15 +28,15 @@ index b2839c5f43..1feeaf0ec1 100644
  {
  	static int running;
 
-@@ -879,6 +880,7 @@ static void end_packfile(void)
+@@ -881,6 +882,7 @@ static void end_packfile(void)
 
  		close_pack_windows(pack_data);
  		finalize_hashfile(pack_file, cur_pack_oid.hash, FSYNC_COMPONENT_PACK, 0);
 +		pack_file = NULL;
  		fixup_pack_header_footer(the_hash_algo, pack_data->pack_fd,
  					 pack_data->hash, pack_data->pack_name,
  					 object_count, cur_pack_oid.hash,
-@@ -978,6 +980,9 @@ static int store_object(
+@@ -980,6 +982,9 @@ static int store_object(
  		e->pack_id = MAX_PACK_ID;
  		e->idx.offset = 1; /* just not zero! */
  		duplicate_count_by_type[type]++;

src/fast-import.c.patch

@@ -193,11 +193,16 @@ extern "C" {
     pub static http_follow_config: http_follow_config;
 }
 
+#[allow(non_camel_case_types)]
+#[repr(C)]
+pub struct object_database([u8; 0]);
+
 #[allow(non_camel_case_types)]
 #[repr(C)]
 pub struct repository {
     gitdir: *const c_char,
     commondir: *const c_char,
+    objects: *mut object_database,
 }
 
 #[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
@@ -247,8 +252,8 @@ impl Default for object_info {
 }
 
 extern "C" {
-    fn oid_object_info_extended(
-        r: *mut repository,
+    fn odb_read_object_info_extended(
+        r: *mut object_database,
         oid: *const object_id,
         oi: *mut object_info,
         flags: c_uint,
@@ -335,7 +340,9 @@ pub fn git_object_info(
         info.sizep = &mut len;
         info.contentp = &mut buf;
     }
-    (unsafe { oid_object_info_extended(the_repository, &oid.into().into(), &mut info, 0) } == 0)
+    (unsafe {
+        odb_read_object_info_extended((*the_repository).objects, &oid.into().into(), &mut info, 0)
+    } == 0)
         .then(|| {
             (
                 t,

src/libgit.rs

@@ -6,9 +6,9 @@ index 1644a0d985..24b821dafd 100644
  #include "setup.h"
  #include "streaming.h"
 
-+#define write_object_file_flags real_write_object_file_flags
++#define write_object_file real_write_object_file
 +
-+int real_write_object_file_flags(const void *buf, size_t len,
++int real_write_object_file(struct odb_source *source, const void *buf, size_t len,
 +			    enum object_type type, struct object_id *oid,
 +			    struct object_id *compat_oid_in, unsigned flags);
 +