]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'fixes/2.45.1/2.43' into fixes/2.45.1/2.44
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:58:35 +0000 (16:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 May 2024 23:58:35 +0000 (16:58 -0700)
* fixes/2.45.1/2.43:
  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
ci/install-dependencies.sh
config.c
fsck.c
t/t1450-fsck.sh
t/t5601-clone.sh

Simple merge
diff --cc builtin/clone.c
index 4933771822c70623f43dcdafb4c4c1d27674bb48,40cfac455e21edc9aa08051d5fa0b5aa0a452299..9dcb7fff8c5757d18ac15ec2c4c255bcf550de4f
@@@ -963,10 -960,7 +963,8 @@@ int cmd_clone(int argc, const char **ar
        int submodule_progress;
        int filter_submodules = 0;
        int hash_algo;
 +      unsigned int ref_storage_format = REF_STORAGE_FORMAT_UNKNOWN;
        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;
                }
        }
  
 -      init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL,
 -              do_not_override_repo_unix_permissions, INIT_DB_QUIET);
 +      /*
 +       * Initialize the repository, but skip initializing the reference
 +       * database. We do not yet know about the object format of the
 +       * repository, and reference backends may persist that information into
 +       * their on-disk data structures.
 +       */
-       init_db(git_dir, real_git_dir, template_dir, GIT_HASH_UNKNOWN,
++      init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN,
 +              ref_storage_format, NULL,
 +              do_not_override_repo_unix_permissions, INIT_DB_QUIET | INIT_DB_SKIP_REFDB);
  
        if (real_git_dir) {
                free((char *)git_dir);
index b4e22de3cb9c351098cc57105c12e6242d1a4384,33039d516b8d1737b9fb0e5cb14be7224146125f..fa0c00c60603a6bc3f9d6b0a794696b38aff3d8f
@@@ -34,12 -34,10 +34,10 @@@ macos-*
        export HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1
        # Uncomment this if you want to run perf tests:
        # brew install gnu-time
-       test -z "$BREW_INSTALL_PACKAGES" ||
-       brew install $BREW_INSTALL_PACKAGES
        brew link --force gettext
 -      mkdir -p $HOME/bin
 -      (
 -              cd $HOME/bin
 +
 +      mkdir -p "$P4_PATH"
 +      pushd "$P4_PATH"
                wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" &&
                tar -xf helix-core-server.tgz &&
                sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true
diff --cc config.c
Simple merge
diff --cc fsck.c
Simple merge
diff --cc t/t1450-fsck.sh
Simple merge
Simple merge