[JENKINS-76026] Do not show merges in changelog #1327
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git client 6.3.1 adapted the git client plugin to support command line git 2.51.0 where the "whatchanged" command has been deprecated. However, the change introduced an inconsistency between the CLI git implementation and the JGit implementation. Prior to git client plugin 6.3.1, the changelog skipped merge commits in all cases. With git client 6.3.1, the CLI git changelog includes merge commits. With git client 6.3.1, the JGit changelog does not include merge commits. Testing done: * Confirmed the bug with interactive testing of git client plugin 6.3.1 * Wrote an automated test that shows the inconsistency * Confirmed that the automated test fails with git client 6.3.1 and passes with the fix
6 tasks
basil
pushed a commit
to basil/git-client-plugin
that referenced
this pull request
Sep 3, 2025
Git client 6.3.1 adapted the git client plugin to support command line git 2.51.0 where the "whatchanged" command has been deprecated. However, the change introduced an inconsistency between the CLI git implementation and the JGit implementation. Prior to git client plugin 6.3.1, the changelog skipped merge commits in all cases. With git client 6.3.1, the CLI git changelog includes merge commits. With git client 6.3.1, the JGit changelog does not include merge commits. Testing done: * Confirmed the bug with interactive testing of git client plugin 6.3.1 * Wrote an automated test that shows the inconsistency * Confirmed that the automated test fails with git client 6.3.1 and passes with the fix (cherry picked from commit 358e279)
MarkEWaite
added a commit
that referenced
this pull request
Sep 3, 2025
Git client 6.3.1 adapted the git client plugin to support command line git 2.51.0 where the "whatchanged" command has been deprecated. However, the change introduced an inconsistency between the CLI git implementation and the JGit implementation. Prior to git client plugin 6.3.1, the changelog skipped merge commits in all cases. With git client 6.3.1, the CLI git changelog includes merge commits. With git client 6.3.1, the JGit changelog does not include merge commits. Testing done: * Confirmed the bug with interactive testing of git client plugin 6.3.1 * Wrote an automated test that shows the inconsistency * Confirmed that the automated test fails with git client 6.3.1 and passes with the fix (cherry picked from commit 358e279)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[JENKINS-76026] Do not show merges in changelog
Git client 6.3.1 adapted the git client plugin to support command line git 2.51.0 where the "whatchanged" command has been deprecated. However, the change introduced an inconsistency between the CLI git implementation and the JGit implementation.
Prior to git client plugin 6.3.1, the changelog skipped merge commits in all cases.
With git client 6.3.1, the CLI git changelog includes merge commits. With git client 6.3.1, the JGit changelog does not include merge commits.
Testing done
Submitter checklist