github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-05 17:20:23 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

no way to disable pull request description as default squash merge commit message details #14029

New Issue
Open
opened 2025-11-02 11:00:41 -06:00 by GiteaMirror · 6 comments
GiteaMirror commented 2025-11-02 11:00:41 -06:00
Owner
Copy Link

Originally created by @trim21 on GitHub (Jan 22, 2025).

Feature Description

I'm trying to get gitea behavior like this github option:

Image

There is no same option in gitea so I try to use default merge message to achieve this.

The .gitea/default_merge_message/SQUASH_TEMPLATE.md allow users to override default squash message but gitea will always prepend pull request description as commit message details

for example, for pull request

fix: something

hello

and template .gitea/default_merge_message/SQUASH_TEMPLATE.md

${PullRequestTitle} (${PullRequestReference})

test

the default commit message details will always be

hello

test

instead of expected text only

Screenshots

Image

Originally created by @trim21 on GitHub (Jan 22, 2025). ### Feature Description I'm trying to get gitea behavior like this github option: ![Image](https://github.com/user-attachments/assets/59bf2194-502d-4d5a-bc0a-3d237d98fa59) There is no same option in gitea so I try to use default merge message to achieve this. The `.gitea/default_merge_message/SQUASH_TEMPLATE.md` allow users to override default squash message but gitea will always prepend pull request description as commit message details for example, for pull request ``` fix: something hello ``` and template `.gitea/default_merge_message/SQUASH_TEMPLATE.md` ```md ${PullRequestTitle} (${PullRequestReference}) test ``` the default commit message details will always be ``` hello test ``` instead of expected `text` only ### Screenshots ![Image](https://github.com/user-attachments/assets/3c8a9a1f-6d6b-4fa0-bad5-7d78fdf6e355)
GiteaMirror added the type/proposal label 2025-11-02 11:00:41 -06:00
GiteaMirror commented 2025-11-02 11:00:42 -06:00
Author
Owner
Copy Link

@yp05327 commented on GitHub (Jan 22, 2025):

Related: #20618
This PR break the default merge message template.
It seems that the commit message should be included in defaultSquashMergeMessage, not hard coding in template

@yp05327 commented on GitHub (Jan 22, 2025): Related: #20618 This PR break the default merge message template. It seems that the commit message should be included in `defaultSquashMergeMessage`, not hard coding in template
GiteaMirror commented 2025-11-02 11:00:42 -06:00
Author
Owner
Copy Link

@wxiaoguang commented on GitHub (Jan 23, 2025):

Related: #20618
This PR break the default merge message template.

Sorry but why it's related? I don't 20618 touched PullRequestReference or removed something related .........

@wxiaoguang commented on GitHub (Jan 23, 2025): > Related: [#20618](https://github.com/go-gitea/gitea/pull/20618) > This PR break the default merge message template. Sorry but why it's related? I don't `20618` touched PullRequestReference or removed something related .........
GiteaMirror commented 2025-11-02 11:00:42 -06:00
Author
Owner
Copy Link

@yp05327 commented on GitHub (Jan 23, 2025):

#20618 added GetCommitMessages to the squash merge message which is hard coding

Image

so no matter how end user change the defaultMergeMessage, it will always include GetCommitMessages.

If don't want to break the old design before 1.17.0, then commit message should be included in defaultSquashMergeMessage (which is called defaultMergeMessage before) instead of always showing it on the top?

Image

Another strange things is why GetCommitMessages equals the PR description message here.
I got the answer:
Image

@yp05327 commented on GitHub (Jan 23, 2025): #20618 added `GetCommitMessages` to the squash merge message which is hard coding ![Image](https://github.com/user-attachments/assets/5eb5909b-39b3-48df-b137-ea55445832e3) so no matter how end user change the `defaultMergeMessage`, it will always include `GetCommitMessages`. If don't want to break the old design before 1.17.0, then commit message should be included in `defaultSquashMergeMessage` (which is called `defaultMergeMessage` before) instead of always showing it on the top? ![Image](https://github.com/user-attachments/assets/b1c1ecab-2ff2-4c99-96d5-3241993963f8) ~~Another strange things is why `GetCommitMessages` equals the PR description message here.~~ I got the answer: ![Image](https://github.com/user-attachments/assets/150ae204-09c9-4f18-bd25-c845b13ebefe)
GiteaMirror commented 2025-11-02 11:00:42 -06:00
Author
Owner
Copy Link

@wxiaoguang commented on GitHub (Jan 23, 2025):

#20618 added GetCommitMessages to the squash merge message which is hard coding

TBH it is a bug fix but not a breaking change: https://github.com/go-gitea/gitea/pull/20618#issuecomment-1203017798 .

If I understand correctly, it is a quite old behavior (add commit messages) since Provide Default messages for merges (#9393)

@wxiaoguang commented on GitHub (Jan 23, 2025): > [#20618](https://github.com/go-gitea/gitea/pull/20618) added `GetCommitMessages` to the squash merge message which is hard coding TBH it is a bug fix but not a breaking change: https://github.com/go-gitea/gitea/pull/20618#issuecomment-1203017798 . If I understand correctly, it is a quite old behavior (add commit messages) since Provide Default messages for merges (#9393) * https://github.com/go-gitea/gitea/pull/9393/files#diff-7f25271f6c80f878fdb80a556b5fb2066352bc24d79736b32215205b5fc908c4R197
GiteaMirror commented 2025-11-02 11:00:42 -06:00
Author
Owner
Copy Link

@yp05327 commented on GitHub (Jan 23, 2025):

So this can be improved now?

  • add a variable for commit messages
  • by default, it will show commit message/PR content which will not break the old behavior
  • user can completely change the default squash message by using the template
@yp05327 commented on GitHub (Jan 23, 2025): So this can be improved now? - add a variable for commit messages - by default, it will show commit message/PR content which will not break the old behavior - user can completely change the default squash message by using the template
GiteaMirror commented 2025-11-02 11:00:43 -06:00
Author
Owner
Copy Link

@trim21 commented on GitHub (Jan 23, 2025):

there should be variable PullRequestBody or something so users can add it when they want it and avoid it when they do not want it.

@trim21 commented on GitHub (Jan 23, 2025): there should be variable `PullRequestBody` or something so users can add it when they want it and avoid it when they do not want it.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label type/proposal
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#14029
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?