git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v9 3/4] branch: add --delete-integrated to delete rebase and squash merged branches

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 20, 2026, 20:02 UTC
Message-ID
<xmqqzev3nue9.fsf@gitster.g>
In-Reply-To
<1f922a00344f6b86dcc0054b3117f1bbad247810.1795184664.git.gitgitgadget@gmail.com>
"Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> Subject: Re: [PATCH v9 3/4] branch: add --delete-integrated to delete rebase and squash merged branches
The title is on a tad overlong side.

"rebase and squash merged branches" sounds awkward. If a branch got intergrated by squash merging is called "squash-merged branch", shouldn't a branch that underwent "git rebase" to sit on top of the upstream be called "rebased branch"?

IOW, "rebased or squash-merged branches"?
Show 16 quoted lines
> diff --git a/Documentation/config/branch.adoc b/Documentation/config/branch.adoc
> index c2acd89c99..be9b296bda 100644
> --- a/Documentation/config/branch.adoc
> +++ b/Documentation/config/branch.adoc
> @@ -106,7 +106,7 @@ for details).
>  
>  `branch.<name>.deleteMerged`::
>  	If set to `false`, branch _<name>_ is exempt from
> -	`git branch --delete-merged`.  Useful for a topic branch you
> -	intend to develop further after an initial round has been
> -	merged upstream.  Defaults to true.  Explicit deletion via
> -	`git branch -d` is unaffected.
> +	`git branch --delete-merged` and `--delete-integrated`.  Useful
> +	for a topic branch you intend to develop further after an
> +	initial round has been merged upstream.  Defaults to true.
> +	Explicit deletion via `git branch -d` is unaffected.

Does the deleteMerged configuration variable affect the behavior of the "--delete-integrated" option? Knowing how the feature evolved, it is understandable to me, but I suspect it won't be natural for mere mortals.

Perhaps a single .deleteDone variable that governs both would be more future-proof, as it anticipates that we may find other ways a branch becomes "done", other than by getting merged or otherwise integrated, and when that happens this variable will also deal with such a new destructive operation.

Show 184 quoted lines
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index 44336eef81..54461e90b3 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -1963,6 +1963,39 @@ check_branches () {
>  	test_cmp expect actual
>  }
>  
> +test_expect_success '--delete-merged does not delete unrelated branches' '
> +	setup_repo_for_delete_merged &&
> +	(
> +		cd repo &&
> +		git checkout -b unrelated-topic --track origin/next &&
> +		test_write_lines 1 2 3 4 >file &&
> +		git add file &&
> +		git commit -m "add file" &&
> +		git push origin unrelated-topic &&
> +		git checkout --detach
> +	) &&
> +	(
> +		cd upstream &&
> +		git checkout next &&
> +		test_write_lines 1 2 3 4 >file &&
> +		test_write_lines 5 6 7 >elif &&
> +		git add file elif &&
> +		git commit --author="unrelated user <uu@example.com>" \
> +			-m "unrelated commit adding an identical file" &&
> +		git checkout main
> +	) &&
> +	(
> +		cd repo &&
> +		git fetch origin &&
> +		git branch --delete-merged origin/next >actual 2>&1 &&
> +		test_must_be_empty actual &&
> +		check_branches <<-\EOF
> +		main
> +		unrelated-topic
> +		EOF
> +	)
> +'
> +
>  test_expect_success '--delete-merged keeps cloned main without explicit push configuration' '
>  	setup_repo_for_delete_merged &&
>  	(
> @@ -2017,6 +2050,143 @@ test_expect_success '--delete-merged deletes only selected merged branches' '
>  	)
>  '
>  
> +push_topic () {
> +	branch=$1 &&
> +	shift &&
> +	(
> +		cd repo &&
> +		git checkout -b "$branch" --track origin/next &&
> +		for commit in "$@"
> +		do
> +			test_commit "$commit" || return 1
> +		done &&
> +		git push origin "$branch" &&
> +		git checkout --detach
> +	)
> +}
> +
> +squash_merge_upstream () {
> +	(
> +		cd upstream &&
> +		git checkout next &&
> +		git merge --squash "$1" &&
> +		git commit -m "Squash merge of $1" &&
> +		git checkout main
> +	)
> +}
> +
> +rebase_merge_upstream () {
> +	(
> +		cd upstream &&
> +		git rebase next "$1" &&
> +		git checkout next &&
> +		git merge --ff-only "$1" &&
> +		git checkout main
> +	)
> +}
> +
> +test_expect_success '--delete-integrated deletes a rebase merged branch' '
> +	setup_repo_for_delete_merged &&
> +	push_topic rebased rebased-one rebased-two &&
> +	(
> +		cd upstream &&
> +		git checkout next &&
> +		test_commit before-rebase &&
> +		git checkout main
> +	) &&
> +	rebase_merge_upstream rebased &&
> +	landed=$(git -C upstream rev-parse --short next) &&
> +	(
> +		cd repo &&
> +		git fetch origin &&
> +		sha=$(git rev-parse --short rebased) &&
> +
> +		git branch --delete-integrated origin/next >actual 2>&1 &&
> +		echo "Deleted branch rebased (was $sha, landed as $landed)." >expect &&
> +		test_cmp expect actual &&
> +
> +		check_branches <<-\EOF
> +		main
> +		EOF
> +	)
> +'
> +
> +test_expect_success '--delete-integrated deletes a squash merged branch' '
> +	setup_repo_for_delete_merged &&
> +	push_topic squashed squashed-one squashed-two &&
> +	push_topic partial lands-upstream stays-local &&
> +	squash_merge_upstream partial~1 &&
> +	squash_merge_upstream squashed &&
> +	squash=$(git -C upstream rev-parse --short next) &&
> +	(
> +		cd repo &&
> +		git fetch origin &&
> +		sha=$(git rev-parse --short squashed) &&
> +
> +		git branch --delete-integrated origin/next >actual 2>&1 &&
> +		echo "Deleted branch squashed (was $sha, landed as $squash)." >expect &&
> +		test_cmp expect actual &&
> +
> +		check_branches <<-\EOF
> +		main
> +		partial
> +		EOF
> +	)
> +'
> +
> +test_expect_success '--delete-integrated deletes a squash merged branch that was reverted' '
> +	setup_repo_for_delete_merged &&
> +	push_topic reverted reverted-work &&
> +	squash_merge_upstream reverted &&
> +	squash=$(git -C upstream rev-parse --short next) &&
> +	(
> +		cd upstream &&
> +		git checkout next &&
> +		git revert --no-edit HEAD &&
> +		git checkout main
> +	) &&
> +	(
> +		cd repo &&
> +		git fetch origin &&
> +		sha=$(git rev-parse --short reverted) &&
> +
> +		git branch --delete-integrated origin/next >actual 2>&1 &&
> +		echo "Deleted branch reverted (was $sha, landed as $squash)." >expect &&
> +		test_cmp expect actual &&
> +
> +		check_branches <<-\EOF
> +		main
> +		EOF
> +	)
> +'
> +
> +test_expect_success '--delete-integrated reports a merge plainly next to an unmerged branch' '
> +	setup_repo_for_delete_merged &&
> +	push_topic a-unmerged unmerged-work &&
> +	push_topic b-merged merged-work &&
> +	(
> +		cd upstream &&
> +		git checkout next &&
> +		test_commit upstream-work &&
> +		git merge --no-ff b-merged &&
> +		git checkout main
> +	) &&
> +	(
> +		cd repo &&
> +		git fetch origin &&
> +		sha=$(git rev-parse --short b-merged) &&
> +
> +		git branch --delete-integrated origin/next >actual 2>&1 &&
> +		echo "Deleted branch b-merged (was $sha)." >expect &&
> +		test_cmp expect actual &&
> +
> +		check_branches <<-\EOF
> +		a-unmerged
> +		main
> +		EOF
> +	)
> +'

Does "--dry-run --delete-integrated" combination have test coverage? If not shouldn't it?

Does opting out of "--delete-integrated" feature by setting branch.<name>.deleteMerged to false have test coverage? If not shouldn't it?

Show 6 quoted lines
>  test_expect_success '--delete-merged keeps main despite a different default push remote' '
>  	setup_repo_for_delete_merged &&
>  	create_merged_branch on-next &&
> @@ -2216,4 +2386,10 @@ test_expect_success '--dry-run without --delete-merged is rejected' '
>  	test_grep "requires --delete-merged" err
>  '

It now requires either --delete-merged or --delete-integrated. At least, updating the expected message in the test we can see would be helpful.

Having said that, I do not agree with the design to make "--dry-run" require anything.

If "git branch delete master" is run, and 'master' is checked out, it would error out. "git branch delete --dry-run master" should say "we would not let you delete the currently checked out branch" the same way and exit, no?

Show 5 quoted lines
> +test_expect_success '--delete-integrated cannot be combined with --delete-merged' '
> +	test_must_fail git -C forked branch --delete-merged origin/next \
> +		--delete-integrated origin/next 2>err &&
> +	test_grep "cannot be used together" err
> +'
Good.  You added die-for-incompatible-opt to make them incompatible.

Also do we want to ensure "--quiet" does what it is designed to do? I do not think I saw anything added to t3200 by this series that mentioned the option.

Thanks.
Previous: Harald Nordgren via GitGitGadgetNext: Harald Nordgren via GitGitGadget
Message 101 of 104 in “branch: let --delete-merged find squash merged branches”
  1. branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Sep 29, 2026
  2. Kristoffer HaugsbakkSep 29, 2026
  3. Harald NordgrenSep 29, 2026
  4. Kristoffer HaugsbakkSep 29, 2026
  5. D. Ben KnobleSep 29, 2026
  6. Kristoffer HaugsbakkSep 29, 2026
  7. D. Ben KnobleSep 29, 2026
  8. Harald NordgrenSep 29, 2026
  9. Harald NordgrenSep 29, 2026
  10. D. Ben KnobleSep 29, 2026
  11. Harald NordgrenSep 29, 2026
  12. Phillip WoodOct 4, 2026
  13. Harald NordgrenOct 4, 2026
  14. Phillip WoodOct 8, 2026
  15. Harald NordgrenOct 8, 2026
  16. Kristoffer HaugsbakkOct 9, 2026
  17. Harald NordgrenOct 9, 2026
  18. Harald NordgrenOct 9, 2026
  19. Phillip WoodOct 9, 2026
  20. Phillip WoodOct 9, 2026
  21. Harald NordgrenOct 9, 2026
  22. D. Ben KnobleOct 8, 2026
  23. Phillip WoodOct 9, 2026
  24. 0/2 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 11, 2026
  25. 1/2 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 11, 2026
  26. 2/2 branch: add --no-squashed to skip the squash searchHarald Nordgren via GitGitGadget, Oct 11, 2026
  27. Junio C HamanoOct 12, 2026
  28. Phillip WoodOct 12, 2026
  29. Harald NordgrenOct 12, 2026
  30. Junio C HamanoOct 12, 2026
  31. Harald NordgrenOct 12, 2026
  32. Junio C HamanoOct 13, 2026
  33. Harald NordgrenOct 17, 2026
  34. Jasper MayoneOct 19, 2026
  35. Harald NordgrenOct 18, 2026
  36. Harald NordgrenOct 12, 2026
  37. D. Ben KnobleOct 12, 2026
  38. 0/3 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 21, 2026
  39. 1/3 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Oct 21, 2026
  40. 2/3 branch: let --delete-merged find rebase merged branchesHarald Nordgren via GitGitGadget, Oct 21, 2026
  41. 3/3 branch: add --squashed to find squash merged branchesHarald Nordgren via GitGitGadget, Oct 21, 2026
  42. Jasper MayoneOct 21, 2026
  43. Harald NordgrenOct 21, 2026
  44. D. Ben KnobleOct 22, 2026
  45. Harald NordgrenOct 22, 2026
  46. Junio C HamanoOct 22, 2026
  47. Harald NordgrenOct 22, 2026
  48. Junio C HamanoOct 22, 2026
  49. Junio C HamanoOct 22, 2026
  50. Harald NordgrenOct 22, 2026
  51. Jasper MayoneOct 22, 2026
  52. Junio C HamanoOct 22, 2026
  53. Harald NordgrenOct 23, 2026
  54. Harald NordgrenOct 22, 2026
  55. D. Ben KnobleOct 22, 2026
  56. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 26, 2026
  57. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Oct 26, 2026
  58. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Oct 26, 2026
  59. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Oct 26, 2026
  60. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Oct 26, 2026
  61. Jasper MayoneOct 29, 2026
  62. Harald NordgrenOct 29, 2026
  63. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Oct 30, 2026
  64. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Oct 30, 2026
  65. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Oct 30, 2026
  66. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Oct 30, 2026
  67. Junio C HamanoOct 30, 2026
  68. Harald NordgrenOct 31, 2026
  69. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Oct 30, 2026
  70. Junio C HamanoOct 30, 2026
  71. Harald NordgrenOct 31, 2026
  72. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 1, 2026
  73. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 1, 2026
  74. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 1, 2026
  75. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 1, 2026
  76. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 1, 2026
  77. Harald NordgrenNov 11, 2026
  78. Jasper MayoneNov 11, 2026
  79. Harald NordgrenNov 14, 2026
  80. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 14, 2026
  81. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 14, 2026
  82. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 14, 2026
  83. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 14, 2026
  84. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 14, 2026
  85. Tuomas AholaNov 14, 2026
  86. Jasper MayoneNov 16, 2026
  87. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 17, 2026
  88. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 17, 2026
  89. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 17, 2026
  90. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 17, 2026
  91. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 17, 2026
  92. Junio C HamanoNov 18, 2026
  93. Jasper MayoneNov 19, 2026
  94. 0/4 branch: let --delete-merged find squash merged branchesHarald Nordgren via GitGitGadget, Nov 20, 2026
  95. 1/4 branch: move the deleteMerged opt-out check into a helperHarald Nordgren via GitGitGadget, Nov 20, 2026
  96. Junio C HamanoNov 20, 2026
  97. Junio C HamanoNov 20, 2026
  98. 2/4 branch: let delete_branches() name where a branch landedHarald Nordgren via GitGitGadget, Nov 20, 2026
  99. Junio C HamanoNov 20, 2026
  100. 3/4 branch: add --delete-integrated to delete rebase and squash merged branchesHarald Nordgren via GitGitGadget, Nov 20, 2026
  101. Junio C HamanoNov 20, 2026
  102. 4/4 branch: let --delete-integrated find branches merged onto changed filesHarald Nordgren via GitGitGadget, Nov 20, 2026
  103. Junio C HamanoNov 20, 2026
  104. Junio C HamanoNov 20, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.