jenkinsci / jenkinsci/git-plugin
[JENKINS-32320] Ability to configure changelog message truncation and inclusion of merge commits
- Dominant language
- Java
- Stars
- 694
- Forks
- 1.1k
- Avg merge
- 1h 29m
- Merged PRs (30d)
- 3
Description
I have a need for the ability to:
- Include merge commits in the changelog
- Prevent truncation of commits in the changelog (see also
JENKINS-29977where someone else has the requirement)
The reason for this is that I want to have the following workflow:
- In JIRA create a new feature branch for an issue (the branch name automatically references the issue ID)
- Add code to the branch
- Create pull request for the branch
- Merge the branch
- Build on Jenkins
- Jenkins parses the issue IDs from the feature branch names in the merge commit messages, and updates the issues (with the jira-plugin)
The problem is that the Git plugins exclude merge commits, and truncate the commit messages before the issue ID features in them.
I have forks that implement this feature, and I would like to know if it is worth tidying them up and writing the tests then submitting a PR, or whether my approach in general is not acceptable.
https://github.com/sfhardman/git-plugin/commit/75c735351032626743cfca28fd8a0902ed7e0b3c
https://github.com/sfhardman/git-client-plugin/commit/6de5518f27d735a3d9b02608cda1dd689c925b12
Thanks
---
Originally reported by sfhardma, imported from: Ability to configure changelog message truncation and inclusion of merge commits
Raw content of original issue
I have a need for the ability to:
- Include merge commits in the changelog
- Prevent truncation of commits in the changelog (see also
JENKINS-29977where someone else has the requirement)The reason for this is that I want to have the following workflow:
- In JIRA create a new feature branch for an issue (the branch name automatically references the issue ID)
- Add code to the branch
- Create pull request for the branch
- Merge the branch
- Build on Jenkins
- Jenkins parses the issue IDs from the feature branch names in the merge commit messages, and updates the issues (with the jira-plugin)
The problem is that the Git plugins exclude merge commits, and truncate the commit messages before the issue ID features in them.
I have forks that implement this feature, and I would like to know if it is worth tidying them up and writing the tests then submitting a PR, or whether my approach in general is not acceptable.
https://github.com/sfhardman/git-plugin/commit/75c735351032626743cfca28fd8a0902ed7e0b3c
https://github.com/sfhardman/git-client-plugin/commit/6de5518f27d735a3d9b02608cda1dd689c925b12
Thanks
Contributor guide
Assessment
This issue has not been assessed yet.