Update git-core to v2.47.0

glandium · Oct 8, 2024 · 4d88dae · 4d88dae
1 parent 16ba6f2
commit 4d88dae
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/CI/git-transport-disconnect.diff b/CI/git-transport-disconnect.diff
@@ -1,8 +1,8 @@
 diff --git a/builtin/clone.c b/builtin/clone.c
-index a57b5ce9e6..f73d3b9068 100644
+index e77339c847..b1a9973b7c 100644
 --- a/builtin/clone.c
 +++ b/builtin/clone.c
-@@ -1341,7 +1341,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
+@@ -1534,7 +1534,7 @@ int cmd_clone(int argc,
  	submodule_progress = transport->progress;
 
  	transport_unlock_pack(transport, 0);
@@ -11,21 +11,23 @@ index a57b5ce9e6..f73d3b9068 100644
 
  	if (option_dissociate) {
  		close_object_store(the_repository->objects);
-@@ -1349,7 +1349,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
- 	}
+@@ -1545,8 +1545,9 @@ int cmd_clone(int argc,
+ 		return 1;
 
  	junk_mode = JUNK_LEAVE_REPO;
--	err = checkout(submodule_progress, filter_submodules);
+-	err = checkout(submodule_progress, filter_submodules,
+-		       ref_storage_format);
 +	if (!err)
-+		err = checkout(submodule_progress, filter_submodules);
++		err = checkout(submodule_progress, filter_submodules,
++			       ref_storage_format);
 
  	free(remote_name);
  	strbuf_release(&reflog_msg);
 diff --git a/builtin/fetch.c b/builtin/fetch.c
-index e3791f09ed..c8f93ba9a6 100644
+index 80a64d0d26..eddb6616e2 100644
 --- a/builtin/fetch.c
 +++ b/builtin/fetch.c
-@@ -2022,7 +2022,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
+@@ -2068,7 +2068,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
  {
  	struct refspec rs = REFSPEC_INIT_FETCH;
  	int i;
@@ -34,8 +36,8 @@ index e3791f09ed..c8f93ba9a6 100644
  	int maybe_prune_tags;
  	int remote_via_config = remote_is_configured(remote, 0);
 
-@@ -2088,9 +2088,9 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
- 	exit_code = do_fetch(gtransport, &rs);
+@@ -2134,9 +2134,9 @@ static int fetch_one(struct remote *remote, int argc, const char **argv,
+ 	exit_code = do_fetch(gtransport, &rs, config);
  	sigchain_pop(SIGPIPE);
  	refspec_clear(&rs);
 -	transport_disconnect(gtransport);
@@ -45,4 +47,4 @@ index e3791f09ed..c8f93ba9a6 100644
 +	return exit_code || disconnect_code;
  }
 
- int cmd_fetch(int argc, const char **argv, const char *prefix)
+ int cmd_fetch(int argc,
diff --git a/CI/tools.py b/CI/tools.py
@@ -17,7 +17,7 @@
 from variables import TC_BRANCH, TC_IS_PUSH
 
 MERCURIAL_VERSION = "6.8"
-GIT_VERSION = "2.46.2"
+GIT_VERSION = "2.47.0"
 
 ALL_MERCURIAL_VERSIONS = (
     "1.9.3",

diff --git a/git-core b/git-core
diff --git a/src/curl-compat.c b/src/curl-compat.c
@@ -26,3 +26,4 @@ void curl_multi_strerror() {}
 void curl_multi_timeout() {}
 void curl_slist_append() {}
 void curl_slist_free_all() {}
+void curl_version_info() {}
diff --git a/src/libgit.rs b/src/libgit.rs
@@ -933,7 +933,13 @@ extern "C" {
     pub fn refs_for_each_ref_in(
         refs: *const ref_store,
         prefix: *const c_char,
-        cb: unsafe extern "C" fn(*const c_char, *const object_id, c_int, *mut c_void) -> c_int,
+        cb: unsafe extern "C" fn(
+            *const c_char,
+            *const c_char,
+            *const object_id,
+            c_int,
+            *mut c_void,
+        ) -> c_int,
         cb_data: *mut c_void,
     ) -> c_int;
 }
@@ -950,6 +956,7 @@ pub fn for_each_ref_in<E, S: AsRef<OsStr>, F: FnMut(&OsStr, CommitId) -> Result<
 
     unsafe extern "C" fn each_ref_cb<E, F: FnMut(&OsStr, CommitId) -> Result<(), E>>(
         refname: *const c_char,
+        _referent: *const c_char,
         oid: *const object_id,
         _flags: c_int,
         cb_data: *mut c_void,

diff --git a/src/mingw.c b/src/mingw.c
@@ -8,6 +8,7 @@ static inline void winansi_init(void) {}
 extern int cinnabar_main(int argc, const char *argv[]);
 // Work around the function being declared despite NO_UNIX_SOCKETS.
 int mingw_have_unix_sockets(void);
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "compat/mingw.c"
 #else
 typedef int make_pedantic_happy;