]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:57:43 +0000 (16:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:57:43 +0000 (16:57 -0700)
* 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

1  2 
.github/workflows/main.yml
builtin/clone.c
config.c
copy.c
fsck.c
fsck.h
hook.c
t/helper/test-path-utils.c
t/t1450-fsck.sh
t/t1800-hook.sh

Simple merge
diff --cc builtin/clone.c
index 72e89c309a01f39e31af21e22da114540965bb8b,b7db074b7e3f10b3e8c29eb78b45f41c07e6fe0f..2fce25acd46bfce001763ebf98d296dfb067d640
@@@ -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 char *template_dir;
-       char *template_dir_dup = NULL;
 +      const int do_not_override_repo_unix_permissions = -1;
  
        struct transport_ls_refs_options transport_ls_refs_options =
                TRANSPORT_LS_REFS_OPTIONS_INIT;
                }
        }
  
-       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);
diff --cc config.c
Simple merge
diff --cc copy.c
Simple merge
diff --cc fsck.c
Simple merge
diff --cc fsck.h
Simple merge
diff --cc hook.c
Simple merge
Simple merge
diff --cc t/t1450-fsck.sh
Simple merge
diff --cc t/t1800-hook.sh
Simple merge