Skip to content

Allow empty commit when merging pull request with squash style #35989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxiaoguang merged 6 commits into from
Nov 22, 2025
+38 −1
Merged

Allow empty commit when merging pull request with squash style #35989

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e7550f
Allow empty commit when merging pull request with squash style
lunny Nov 20, 2025
8a6c0a0
Remove unused test
lunny Nov 20, 2025
572f6d8
fix test
Zettat123 Nov 22, 2025
755fb2e
fix lint
wxiaoguang Nov 22, 2025
f587552
Merge branch 'main' into lunny/allow_empty_squash_merge_pr
wxiaoguang Nov 22, 2025
7167a5e
Update .editorconfig
wxiaoguang Nov 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion services/pull/merge_squash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error {
}
cmdCommit := gitcmd.NewCommand("commit").
AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email).
AddOptionFormat("--message=%s", message)
AddOptionFormat("--message=%s", message).
AddArguments("--allow-empty")
if ctx.signKey == nil {
cmdCommit.AddArguments("--no-gpg-sign")
} else {
Expand Down