From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 24 Apr 2024 07:11:55 +0000 (+0200)
Subject: Sync with 2.44.1
X-Git-Tag: v2.45.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c00f92eb5ee4a48ab615eefa41f2dd6024d43bc;p=thirdparty%2Fgit.git

Sync with 2.44.1

* maint-2.44: (41 commits)
  Git 2.44.1
  Git 2.43.4
  Git 2.42.2
  Git 2.41.1
  Git 2.40.2
  Git 2.39.4
  fsck: warn about symlink pointing inside a gitdir
  core.hooksPath: add some protection while cloning
  init.templateDir: consider this config setting protected
  clone: prevent hooks from running during a clone
  Add a helper function to compare file contents
  init: refactor the template directory discovery into its own function
  find_hook(): refactor the `STRIP_EXTENSION` logic
  clone: when symbolic links collide with directories, keep the latter
  entry: report more colliding paths
  t5510: verify that D/F confusion cannot lead to an RCE
  submodule: require the submodule path to contain directories only
  clone_submodule: avoid using `access()` on directories
  submodules: submodule paths must not contain symlinks
  clone: prevent clashing git dirs when cloning submodule in parallel
  ...
---

1c00f92eb5ee4a48ab615eefa41f2dd6024d43bc
diff --cc builtin/upload-pack.c
index 15afb97260,272cddaafd..46d93278d9
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@@ -8,7 -8,6 +8,8 @@@
  #include "replace-object.h"
  #include "upload-pack.h"
  #include "serve.h"
 +#include "commit.h"
++#include "environment.h"
  
  static const char * const upload_pack_usage[] = {
  	N_("git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
@@@ -38,7 -37,8 +39,8 @@@ int cmd_upload_pack(int argc, const cha
  
  	packet_trace_identity("upload-pack");
  	disable_replace_refs();
 -	/* TODO: This should use NO_LAZY_FETCH_ENVIRONMENT */
 -	xsetenv("GIT_NO_LAZY_FETCH", "1", 0);
 +	save_commit_buffer = 0;
++	xsetenv(NO_LAZY_FETCH_ENVIRONMENT, "1", 0);
  
  	argc = parse_options(argc, argv, prefix, options, upload_pack_usage, 0);
  
diff --cc promisor-remote.c
index ac3aa1e365,7faf33b4d7..b414922c44
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@@ -8,6 -8,6 +8,7 @@@
  #include "transport.h"
  #include "strvec.h"
  #include "packfile.h"
++#include "environment.h"
  
  struct promisor_remote_config {
  	struct promisor_remote *promisors;
@@@ -23,6 -23,16 +24,15 @@@ static int fetch_objects(struct reposit
  	int i;
  	FILE *child_in;
  
 -	/* TODO: This should use NO_LAZY_FETCH_ENVIRONMENT */
 -	if (git_env_bool("GIT_NO_LAZY_FETCH", 0)) {
++	if (git_env_bool(NO_LAZY_FETCH_ENVIRONMENT, 0)) {
+ 		static int warning_shown;
+ 		if (!warning_shown) {
+ 			warning_shown = 1;
+ 			warning(_("lazy fetching disabled; some objects may not be available"));
+ 		}
+ 		return -1;
+ 	}
+ 
  	child.git_cmd = 1;
  	child.in = -1;
  	if (repo != the_repository)