From: Harald Nordgren via GitGitGadget Date: Tue, 17 Nov 2026 13:24:32 GMT Subject: [PATCH v8 0/4] branch: let --delete-merged find squash merged branches Message-ID: In-Reply-To: Branches merged on GitHub with "Squash and merge" or "Rebase and merge" are never deleted by git branch --delete-merged, because their tips are not reachable from the upstream. This treats such a branch as merged when some upstream commit contains all of its changes, and names that commit in the output: Deleted branch topic (was 1a2b3c4, landed as 9f8e7d6). Changes in v8: * Reword commit messages. Changes in v7: * Added a test that --delete-integrated keeps a branch whose changes did not land. * Read the index once before the walk in find_landed_commits(), instead of for every file merge at every candidate commit. * The commit message now says the merge uses this repository's attributes from the working tree and the index. Changes in v6: * Read the index before the file merge, so .gitattributes that are only in the index are honored too. * Renamed the diff_options variables from opt to diffopt. Changes in v5: * git branch -h lists --delete-integrated in the usage lines * Giving both --delete-merged and --delete-integrated dies with a short "cannot be used together" message instead of the full usage text Changes in v4: * --delete-merged works as it does on master again: it only deletes branches whose tip is reachable from their upstream * New --delete-integrated also deletes branches that were rebase or squash merged, including those squashed after upstream changed the same files. It replaces --squashed * New prep commit lets delete_branches() take a map of where each branch landed, so "landed as" is printed there * Added Junio's test that --delete-merged keeps a branch when an unrelated upstream commit adds an identical file * --dry-run works with either option, and the two options can't be combined Changes in v3: * Split into multiple commits, one for rebase merges and one for squash merges. * By default a branch counts as merged when an upstream commit has its exact version of every file it changed. This never reads file contents, so it stays cheap in a partial clone. It finds rebase merges, and squash merges where upstream left those files alone. * Replace --no-squashed with an opt-in --squashed, which also finds branches merged after upstream changed the same files by merging those files. * Add a test for a rebase merge, and check that a squash onto changed files is kept without --squashed and deleted with it. Changes in v2: * Diff each upstream commit once and share the result between all branches, faster than v1. * Fix a branch merged with a merge commit being reported as "landed as" the merge when another branch was searched first, and add a test for it. Show the topic commit itself in "landed as" for work that arrived through a merge. * Use git merge --squash as the example in the commit message and mention GitHub's squash and rebase buttons. * Add --no-squashed to skip the squash search. Harald Nordgren (4): branch: move the deleteMerged opt-out check into a helper branch: let delete_branches() name where a branch landed branch: add --delete-integrated to delete rebase and squash merged branches branch: let --delete-integrated find branches merged onto changed files Documentation/config/branch.adoc | 8 +- Documentation/git-branch.adoc | 23 +- builtin/branch.c | 361 +++++++++++++++++++++++++++++-- t/t3200-branch.sh | 271 +++++++++++++++++++++++ 4 files changed, 633 insertions(+), 30 deletions(-) base-commit: 7fb6055e678f800320d8ab8cd8f201d9493d1ba0 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2425%2FHaraldNordgren%2Fbranch-delete-squashed-v8 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2425/HaraldNordgren/branch-delete-squashed-v8 Pull-Request: https://github.com/git/git/pull/2425 Range-diff vs v7: 1: 25d2441ce7 = 1: 25d2441ce7 branch: move the deleteMerged opt-out check into a helper 2: 18c3edb6e3 = 2: 18c3edb6e3 branch: let delete_branches() name where a branch landed 3: 7bc634c794 = 3: 7bc634c794 branch: add --delete-integrated to delete rebase and squash merged branches 4: 4b5485584e ! 4: 22658105ed branch: let --delete-integrated find branches merged onto changed files @@ Commit message kept by "git branch --delete-integrated". The squash commit has neither the branch's version of those files nor the fork point's, so the previous check cannot see that the work landed. This happens all the - time on hosting services, where the "Squash and merge" button on GitHub - lands pull requests this way while the main branch keeps moving. A - rebase merge onto such changes looks the same. + time on hosting services such as GitHub, where the "Squash and merge" + button lands pull requests this way, and other pull requests often + touch the same files first. A rebase merge onto such changes looks the + same. For each such file, merge the branch's version into the upstream one and treat the change as landed when that leaves the upstream version @@ Documentation/git-branch.adoc: remove it anyway. + of its changes, even if they were later reverted, and the + message names the first such commit. It does not matter who made + that commit. A file counts when the commit has the branch's -+ version of it, or when merging the branch's version into the -+ commit's leaves it unchanged, which reads the file and may -+ download blobs in a partial clone. The same rules for which -+ branches are kept apply as for `--delete-merged`. ++ version of it. It also counts when merging the branch's version ++ into the commit's version leaves the commit's version unchanged. ++ That merge reads the file, and in a partial clone it may download ++ blobs. The same rules for which branches are kept apply as for ++ `--delete-merged`. `--dry-run`:: With `--delete-merged` or `--delete-integrated`, print which -- gitgitgadget