Skip to content
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.

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

DEFAULT_MERGE_MESSAGE_ALL_AUTHORS configuration during squash commit PR #13976

Closed
1 of 4 tasks
TicoDePano opened this issue Dec 13, 2020 · 4 comments
Closed
1 of 4 tasks

Comments

@TicoDePano
Copy link

  • Gitea version (or commit ref):
    1.13.0
  • Database (use [x]):
    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite

Description

From version 1.13.0, the configuration [repository.pull-request] DEFAULT_MERGE_MESSAGE_ALL_AUTHORS, used as default (false), is not being honoured in a squash commit type of PR.
I just want the commit title in the commit message, as in the earlier versions. Cleaning the message with the Co-Authored-By lines doesn't work, these are appended again to squash commit message.

@zeripath
Copy link
Contributor

DEFAULT_MERGE_MESSAGE_ALL_AUTHORS=false means only collect authors for the DEFAULT_MERGE_MESSAGE_COMMITS_LIMIT.

@TicoDePano
Copy link
Author

Sorry, my bad. Probably the new behaviour has no connection with the configuration.
But from 1.13.0 version the message about Co-Authors is being appended automatically.
image
I am amending my commits to get the title only, as in previous 1.12 versions when no message was inserted.

@TicoDePano
Copy link
Author

@zeripath
Reading your post at #15914 (comment) i thought that the body of the squash merge message would be removed with the new setting.
In 1.15, are there any way to achieve a single message in a squash merge?
Is a lot boring do a force push after every PR merge. And branch protection needs to be disabled to do that.

@TicoDePano
Copy link
Author

Fixed in v1.16.0 by PR #17848.

@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants