From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 May 2024 23:57:43 +0000 (-0700)
Subject: Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42
X-Git-Tag: v2.42.3~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73339e4dc2f00e10b0e86b6a6b275b32e54b1d9c;p=thirdparty%2Fgit.git

Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42

* fixes/2.45.1/2.41:
  Revert "fsck: warn about symlink pointing inside a gitdir"
  Revert "Add a helper function to compare file contents"
  clone: drop the protections where hooks aren't run
  tests: verify that `clone -c core.hooksPath=/dev/null` works again
  Revert "core.hooksPath: add some protection while cloning"
  init: use the correct path of the templates directory again
  hook: plug a new memory leak
  ci: stop installing "gcc-13" for osx-gcc
  ci: avoid bare "gcc" for osx-gcc job
  ci: drop mention of BREW_INSTALL_PACKAGES variable
  send-email: avoid creating more than one Term::ReadLine object
  send-email: drop FakeTerm hack
---

73339e4dc2f00e10b0e86b6a6b275b32e54b1d9c
diff --cc builtin/clone.c
index 72e89c309a,b7db074b7e..2fce25acd4
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@@ -959,9 -959,6 +959,7 @@@ int cmd_clone(int argc, const char **ar
  	int submodule_progress;
  	int filter_submodules = 0;
  	int hash_algo;
 +	const int do_not_override_repo_unix_permissions = -1;
- 	const char *template_dir;
- 	char *template_dir_dup = NULL;
  
  	struct transport_ls_refs_options transport_ls_refs_options =
  		TRANSPORT_LS_REFS_OPTIONS_INIT;
@@@ -1135,8 -1125,8 +1126,8 @@@
  		}
  	}
  
- 	init_db(git_dir, real_git_dir, template_dir, GIT_HASH_UNKNOWN, NULL,
+ 	init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL,
 -		INIT_DB_QUIET);
 +		do_not_override_repo_unix_permissions, INIT_DB_QUIET);
  
  	if (real_git_dir) {
  		free((char *)git_dir);