From: "Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
"D. Ben Knoble" <ben.knoble@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Jasper Mayone <me@jaspermayone.com>, Tuomas Ahola <taahol@utu.fi>,
Harald Nordgren <haraldnordgren@gmail.com>
Subject: [PATCH v9 0/4] branch: let --delete-merged find squash merged branches
Date: Fri, 20 Nov 2026 14:24:20 +0000 [thread overview]
Message-ID: <pull.2425.v9.git.git.1795184664.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2425.git.git.1790667030497.gitgitgadget@gmail.com>
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
<pattern>, 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 <pattern> 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
next prev parent reply other threads:[~2026-11-20 14:24 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-29 7:30 [PATCH] branch: let --delete-merged find squash merged branches Harald Nordgren via GitGitGadget
2026-09-29 7:46 ` Kristoffer Haugsbakk
2026-09-29 7:52 ` Harald Nordgren
2026-09-29 8:08 ` Kristoffer Haugsbakk
2026-09-29 11:18 ` D. Ben Knoble
2026-09-29 13:31 ` Kristoffer Haugsbakk
2026-09-29 11:26 ` D. Ben Knoble
2026-09-29 13:44 ` Harald Nordgren
2026-09-29 13:52 ` Harald Nordgren
2026-09-29 15:28 ` D. Ben Knoble
2026-09-29 18:34 ` Harald Nordgren
2026-10-04 9:54 ` Phillip Wood
2026-10-04 22:28 ` Harald Nordgren
2026-10-08 15:25 ` Phillip Wood
2026-10-08 18:42 ` Harald Nordgren
2026-10-09 8:16 ` Kristoffer Haugsbakk
2026-10-09 11:11 ` Harald Nordgren
2026-10-09 11:18 ` Harald Nordgren
2026-10-09 13:40 ` Phillip Wood
2026-10-09 13:37 ` Phillip Wood
2026-10-09 15:27 ` Harald Nordgren
2026-10-08 17:51 ` D. Ben Knoble
2026-10-09 13:34 ` Phillip Wood
2026-10-11 9:41 ` [PATCH v2 0/2] " Harald Nordgren via GitGitGadget
2026-10-11 9:41 ` [PATCH v2 1/2] " Harald Nordgren via GitGitGadget
2026-10-11 9:41 ` [PATCH v2 2/2] branch: add --no-squashed to skip the squash search Harald Nordgren via GitGitGadget
2026-10-12 0:30 ` [PATCH v2 0/2] branch: let --delete-merged find squash merged branches Junio C Hamano
2026-10-12 9:50 ` Phillip Wood
2026-10-12 14:31 ` Harald Nordgren
2026-10-12 16:50 ` Junio C Hamano
2026-10-12 17:44 ` Harald Nordgren
2026-10-13 2:23 ` Junio C Hamano
2026-10-17 22:23 ` Harald Nordgren
2026-10-19 4:40 ` Jasper Mayone
2026-10-18 15:09 ` Harald Nordgren
2026-10-12 12:41 ` Harald Nordgren
2026-10-12 15:49 ` D. Ben Knoble
2026-10-21 12:28 ` [PATCH v3 0/3] " Harald Nordgren via GitGitGadget
2026-10-21 12:28 ` [PATCH v3 1/3] branch: move the deleteMerged opt-out check into a helper Harald Nordgren via GitGitGadget
2026-10-21 12:28 ` [PATCH v3 2/3] branch: let --delete-merged find rebase merged branches Harald Nordgren via GitGitGadget
2026-10-21 12:28 ` [PATCH v3 3/3] branch: add --squashed to find squash " Harald Nordgren via GitGitGadget
2026-10-21 17:35 ` [PATCH v3 0/3] branch: let --delete-merged " Jasper Mayone
2026-10-21 18:51 ` Harald Nordgren
2026-10-22 12:55 ` D. Ben Knoble
2026-10-22 14:41 ` Harald Nordgren
2026-10-22 5:49 ` Junio C Hamano
2026-10-22 7:18 ` Harald Nordgren
2026-10-22 16:33 ` Junio C Hamano
2026-10-22 16:57 ` Junio C Hamano
2026-10-22 17:31 ` Harald Nordgren
2026-10-22 17:44 ` Jasper Mayone
2026-10-22 17:56 ` Junio C Hamano
2026-10-23 9:07 ` Harald Nordgren
2026-10-22 17:44 ` Harald Nordgren
2026-10-22 12:59 ` D. Ben Knoble
2026-10-26 8:33 ` [PATCH v4 0/4] " Harald Nordgren via GitGitGadget
2026-10-26 8:33 ` [PATCH v4 1/4] branch: move the deleteMerged opt-out check into a helper Harald Nordgren via GitGitGadget
2026-10-26 8:33 ` [PATCH v4 2/4] branch: let delete_branches() name where a branch landed Harald Nordgren via GitGitGadget
2026-10-26 8:33 ` [PATCH v4 3/4] branch: add --delete-integrated to delete rebase and squash merged branches Harald Nordgren via GitGitGadget
2026-10-26 8:33 ` [PATCH v4 4/4] branch: let --delete-integrated find branches merged onto changed files Harald Nordgren via GitGitGadget
2026-10-29 4:30 ` [PATCH v4 0/4] branch: let --delete-merged find squash merged branches Jasper Mayone
2026-10-29 8:30 ` Harald Nordgren
2026-10-30 10:52 ` [PATCH v5 " Harald Nordgren via GitGitGadget
2026-10-30 10:52 ` [PATCH v5 1/4] branch: move the deleteMerged opt-out check into a helper Harald Nordgren via GitGitGadget
2026-10-30 10:53 ` [PATCH v5 2/4] branch: let delete_branches() name where a branch landed Harald Nordgren via GitGitGadget
2026-10-30 10:53 ` [PATCH v5 3/4] branch: add --delete-integrated to delete rebase and squash merged branches Harald Nordgren via GitGitGadget
2026-10-30 19:14 ` Junio C Hamano
2026-10-31 8:09 ` Harald Nordgren
2026-10-30 10:53 ` [PATCH v5 4/4] branch: let --delete-integrated find branches merged onto changed files Harald Nordgren via GitGitGadget
2026-10-30 19:25 ` Junio C Hamano
2026-10-31 8:10 ` Harald Nordgren
2026-11-01 8:22 ` [PATCH v6 0/4] branch: let --delete-merged find squash merged branches Harald Nordgren via GitGitGadget
2026-11-01 8:22 ` [PATCH v6 1/4] branch: move the deleteMerged opt-out check into a helper Harald Nordgren via GitGitGadget
2026-11-01 8:22 ` [PATCH v6 2/4] branch: let delete_branches() name where a branch landed Harald Nordgren via GitGitGadget
2026-11-01 8:22 ` [PATCH v6 3/4] branch: add --delete-integrated to delete rebase and squash merged branches Harald Nordgren via GitGitGadget
2026-11-01 8:22 ` [PATCH v6 4/4] branch: let --delete-integrated find branches merged onto changed files Harald Nordgren via GitGitGadget
2026-11-11 8:30 ` Harald Nordgren
2026-11-11 15:27 ` Jasper Mayone
2026-11-14 11:08 ` Harald Nordgren
2026-11-14 13:24 ` [PATCH v7 0/4] branch: let --delete-merged find squash merged branches Harald Nordgren via GitGitGadget
2026-11-14 13:24 ` [PATCH v7 1/4] branch: move the deleteMerged opt-out check into a helper Harald Nordgren via GitGitGadget
2026-11-14 13:24 ` [PATCH v7 2/4] branch: let delete_branches() name where a branch landed Harald Nordgren via GitGitGadget
2026-11-14 13:24 ` [PATCH v7 3/4] branch: add --delete-integrated to delete rebase and squash merged branches Harald Nordgren via GitGitGadget
2026-11-14 13:24 ` [PATCH v7 4/4] branch: let --delete-integrated find branches merged onto changed files Harald Nordgren via GitGitGadget
2026-11-14 17:14 ` Tuomas Ahola
2026-11-16 16:16 ` Jasper Mayone
2026-11-17 13:24 ` [PATCH v8 0/4] branch: let --delete-merged find squash merged branches Harald Nordgren via GitGitGadget
2026-11-17 13:24 ` [PATCH v8 1/4] branch: move the deleteMerged opt-out check into a helper Harald Nordgren via GitGitGadget
2026-11-17 13:24 ` [PATCH v8 2/4] branch: let delete_branches() name where a branch landed Harald Nordgren via GitGitGadget
2026-11-17 13:24 ` [PATCH v8 3/4] branch: add --delete-integrated to delete rebase and squash merged branches Harald Nordgren via GitGitGadget
2026-11-17 13:24 ` [PATCH v8 4/4] branch: let --delete-integrated find branches merged onto changed files Harald Nordgren via GitGitGadget
2026-11-18 23:05 ` Junio C Hamano
2026-11-19 15:14 ` Jasper Mayone
2026-11-20 14:24 ` Harald Nordgren via GitGitGadget [this message]
2026-11-20 14:24 ` [PATCH v9 1/4] branch: move the deleteMerged opt-out check into a helper Harald Nordgren via GitGitGadget
2026-11-20 14:24 ` [PATCH v9 2/4] branch: let delete_branches() name where a branch landed Harald Nordgren via GitGitGadget
2026-11-20 14:24 ` [PATCH v9 3/4] branch: add --delete-integrated to delete rebase and squash merged branches Harald Nordgren via GitGitGadget
2026-11-20 14:24 ` [PATCH v9 4/4] branch: let --delete-integrated find branches merged onto changed files Harald Nordgren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.2425.v9.git.git.1795184664.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=ben.knoble@gmail.com \
--cc=git@vger.kernel.org \
--cc=haraldnordgren@gmail.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=me@jaspermayone.com \
--cc=phillip.wood123@gmail.com \
--cc=taahol@utu.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox