This is "git show --remerge-diff" of the result of adjusting the jc/fix-aggressive-protection-2.39 topic (which you just saw) into maint-2.40 track. The result is called jc/fix-aggressive-protection-2.40. It is not for direct consumption by "git am". If this format looks reasonable to folks as a way to review the result of merging up fixes, I'll follow up with "patches" for more recent maintenance tracks. diff --git a/builtin/clone.c b/builtin/clone.c remerge CONFLICT (content): Merge conflict in builtin/clone.c index 17d34efebd..399b2d3f42 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1447,15 +1447,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) free(unborn_head); free(dir); free(path); -<<<<<<< b9b439e0e3 (Git 2.40.2) free(repo_to_free); - free(template_dir_dup); -||||||| 47b6d90e91 - free(template_dir_dup); UNLEAK(repo); -======= - UNLEAK(repo); ->>>>>>> 9074ec92e7 (Revert "fetch/clone: detect dubious ownership of local repositories") junk_mode = JUNK_LEAVE_ALL; transport_ls_refs_options_release(&transport_ls_refs_options); diff --git a/t/t1800-hook.sh b/t/t1800-hook.sh remerge CONFLICT (content): Merge conflict in t/t1800-hook.sh index edf0fa1334..3506f627b6 100755 --- a/t/t1800-hook.sh +++ b/t/t1800-hook.sh @@ -177,7 +177,6 @@ test_expect_success 'git hook run a hook with a bad shebang' ' test_cmp expect actual ' -<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< b9b439e0e3 (Git 2.40.2) test_expect_success 'stdin to hooks' ' write_script .git/hooks/test-hook <<-\EOF && echo BEGIN stdin @@ -196,37 +195,4 @@ test_expect_success 'stdin to hooks' ' test_cmp expect actual ' -test_expect_success 'clone protections' ' - test_config core.hooksPath "$(pwd)/my-hooks" && - mkdir -p my-hooks && - write_script my-hooks/test-hook <<-\EOF && - echo Hook ran $1 - EOF - - git hook run test-hook 2>err && - grep "Hook ran" err && - test_must_fail env GIT_CLONE_PROTECTION_ACTIVE=true \ - git hook run test-hook 2>err && - grep "active .core.hooksPath" err && - ! grep "Hook ran" err -' - -|||||||||||||||||||||||||||||||| 47b6d90e91 -test_expect_success 'clone protections' ' - test_config core.hooksPath "$(pwd)/my-hooks" && - mkdir -p my-hooks && - write_script my-hooks/test-hook <<-\EOF && - echo Hook ran $1 - EOF - - git hook run test-hook 2>err && - grep "Hook ran" err && - test_must_fail env GIT_CLONE_PROTECTION_ACTIVE=true \ - git hook run test-hook 2>err && - grep "active .core.hooksPath" err && - ! grep "Hook ran" err -' - -================================ ->>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 9074ec92e7 (Revert "fetch/clone: detect dubious ownership of local repositories") test_done
