Re: [PATCH v18 6/7] branch: add branch.<name>.deleteMerged opt-out
From: Phillip Wood <hidden>
Date: 2026-07-13 15:27:44
Hi Harald On 24/06/2026 22:55, Harald Nordgren via GitGitGadget wrote:
quoted hunk ↗ jump to hunk
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 047ba54778..b7595610d9 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh@@ -2024,4 +2024,30 @@ test_expect_success '--delete-merged clears the upstream of a kept base whose ow test_cmp expect actual ' +test_expect_success '--delete-merged honours branch.<name>.deleteMerged=false' ' + test_when_finished "rm -rf repo" && + setup_repo_for_delete_merged && + merged_branch deleted origin/next && + merged_branch kept origin/next && + git -C repo config branch.kept.deleteMerged false && + git -C repo checkout --detach && + + git -C repo branch --delete-merged origin/next 2>err && + + test_grep "Skipping .kept." err && + test_must_fail git -C repo rev-parse --verify refs/heads/deleted && + git -C repo rev-parse --verify refs/heads/kept
As with the previous patches, I think this would be nicer if we checked the output for for-each-ref. Everything else looks fine. Thanks Phillip
+' + +test_expect_success "branch -d still deletes a deleteMerged=false branch" ' + test_when_finished "rm -rf repo" && + setup_repo_for_delete_merged && + merged_branch kept origin/next && + git -C repo config branch.kept.deleteMerged false && + git -C repo checkout --detach && + + git -C repo branch -d kept && + test_must_fail git -C repo rev-parse --verify refs/heads/kept +' + test_done