Re: [PATCH v18 6/7] branch: add branch.<name>.deleteMerged opt-out
- From
Harald Nordgren <haraldnordgren@gmail.com>
- Date
- Jul 13, 2026, 16:33 UTC
- Message-ID
- <CAHwyqnVSfZmCm51DcMLR0HHBk=vnZR8mQrXRW4pVvXh4==Md3w@mail.gmail.com>
- In-Reply-To
- <f53f7140-b9c0-40dd-8bd3-89917a4eb2a2@gmail.com>
Show 16 quoted lines
> > +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! Yes, I have already created a helper for it, and it makes it a lot clearer. Thanks again for a good suggestion.
Harald