From: Harald Nordgren via GitGitGadget Date: Fri, 20 Nov 2026 14:24:20 GMT Subject: [PATCH v9 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 adds git branch --delete-integrated , which works like --delete-merged and also deletes such a branch when some upstream commit contains all of its changes. It names that commit in the output: Deleted branch topic (was 1a2b3c4, landed as 9f8e7d6). Changes in v9: * Fix --delete-integrated dying with "unable to read blob object" when a path was a submodule at the fork point and both the branch and upstream replaced it with different regular files. Such a branch is now kept. * Add a test for that case. 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 | 363 +++++++++++++++++++++++++++++-- t/t3200-branch.sh | 315 +++++++++++++++++++++++++++ 4 files changed, 679 insertions(+), 30 deletions(-) base-commit: f7de81456940dd6f3274e461149bba12965de609 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2425%2FHaraldNordgren%2Fbranch-delete-squashed-v9 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2425/HaraldNordgren/branch-delete-squashed-v9 Pull-Request: https://github.com/git/git/pull/2425 Range-diff vs v8: 1: 25d2441ce7 = 1: 37ef7636e0 branch: move the deleteMerged opt-out check into a helper 2: 18c3edb6e3 = 2: c4513f9ec1 branch: let delete_branches() name where a branch landed 3: 7bc634c794 = 3: 1f922a0034 branch: add --delete-integrated to delete rebase and squash merged branches 4: 22658105ed ! 4: ef65700303 branch: let --delete-integrated find branches merged onto changed files @@ builtin/branch.c: static int branch_pushes_to_upstream(struct branch *branch, struct branch_change { char *path; - struct object_id branch_oid; +- unsigned short branch_mode; + struct object_id base_oid, branch_oid, upstream_oid; - unsigned short branch_mode; ++ unsigned short base_mode, branch_mode; + enum change_state state; }; @@ builtin/branch.c: static void collect_branch_changes(struct landing_search *sear + &p->one->oid : null_oid(the_hash_algo)); oidcpy(&change->branch_oid, DIFF_FILE_VALID(p->two) ? &p->two->oid : null_oid(the_hash_algo)); ++ change->base_mode = p->one->mode; change->branch_mode = p->two->mode; -@@ builtin/branch.c: static void collect_branch_changes(struct landing_search *search, + } diff_flush(&diffopt); } @@ builtin/branch.c: static void collect_branch_changes(struct landing_search *sear + if (is_null_oid(&change->base_oid) || + is_null_oid(&change->branch_oid) || + oideq(&change->upstream_oid, &change->base_oid) || -+ mode != change->branch_mode || !S_ISREG(mode)) ++ mode != change->branch_mode || !S_ISREG(mode) || ++ !S_ISREG(change->base_mode)) + return CHANGE_MISSING; + return CHANGE_NEEDS_MERGE; } @@ t/t3200-branch.sh: test_expect_success '--delete-integrated deletes a squash mer + EOF + ) +' ++ ++test_expect_success '--delete-integrated keeps a branch that replaced a submodule with a file' ' ++ ( ++ cd upstream && ++ git checkout next && ++ git init lib && ++ test_commit -C lib in-lib && ++ git add lib && ++ git commit -m "add lib as a submodule" && ++ git checkout main ++ ) && ++ setup_repo_for_delete_merged && ++ ( ++ cd repo && ++ git checkout -b replaces-lib --track origin/next && ++ rmdir lib && ++ echo "from the branch" >lib && ++ git add lib && ++ git commit -m "replace lib with a file" && ++ git push origin replaces-lib && ++ git checkout --detach ++ ) && ++ ( ++ cd upstream && ++ git checkout next && ++ rm -rf lib && ++ echo "from upstream" >lib && ++ git add lib && ++ git commit -m "replace lib with another file" && ++ git checkout main ++ ) && ++ ( ++ cd repo && ++ git fetch origin && ++ ++ git branch --delete-integrated origin/next >actual 2>&1 && ++ test_must_be_empty actual && ++ ++ check_branches <<-\EOF ++ main ++ replaces-lib ++ EOF ++ ) ++' + test_expect_success '--delete-integrated reports a merge plainly next to an unmerged branch' ' setup_repo_for_delete_merged && -- gitgitgadget