Skip to content

[JENKINS-76026] Do not show merges in changelog#1327

Merged
MarkEWaite merged 1 commit intojenkinsci:masterfrom
MarkEWaite:exclude-merge-commits-from-changelog
Aug 23, 2025
Merged

[JENKINS-76026] Do not show merges in changelog#1327
MarkEWaite merged 1 commit intojenkinsci:masterfrom
MarkEWaite:exclude-merge-commits-from-changelog

Conversation

@MarkEWaite
Copy link
Contributor

@MarkEWaite MarkEWaite commented Aug 23, 2025

[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

  • 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 passes with git client 6.3.1 for JGit
  • Confirmed that the automated test fails with git client 6.3.1 for CLI git and passes with the fix

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests that demonstrate the feature works or the issue is fixed

@MarkEWaite
[JENKINS-76026] Do not show merges in changelog
3a77b69 
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
@MarkEWaite MarkEWaite added the bug Incorrect or flawed behavior label Aug 23, 2025
@MarkEWaite MarkEWaite requested a review from a team as a code owner August 23, 2025 15:09
@MarkEWaite MarkEWaite added the bug Incorrect or flawed behavior label Aug 23, 2025
@github-actions github-actions bot added the tests Automated test addition or improvement label Aug 23, 2025
@MarkEWaite MarkEWaite merged commit 358e279 into jenkinsci:master Aug 23, 2025
18 checks passed
@MarkEWaite MarkEWaite deleted the exclude-merge-commits-from-changelog branch August 23, 2025 15:59
@basil basil mentioned this pull request Sep 3, 2025
Closed
6 tasks
basil pushed a commit to basil/git-client-plugin that referenced this pull request Sep 3, 2025
@MarkEWaite @basil
[JENKINS-76026] Do not show merges in changelog (jenkinsci#1327)
a7c8875 
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)
@basil basil mentioned this pull request Sep 3, 2025
Merged
MarkEWaite added a commit that referenced this pull request Sep 3, 2025
@MarkEWaite
[JENKINS-76026] Do not show merges in changelog (#1327)
a03638d 
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 to MarkEWaite/update-center2 that referenced this pull request Sep 4, 2025
@MarkEWaite
Mark SECURITY-3590 as also fixed in Git Client Plugin 6.2.1
2307e19 
https://www.jenkins.io/security/advisory/2025-09-03/#SECURITY-3590 is
fixed by backporting the changes from Git Client Plugin 6.3.3

Backport from commit 20090a86c3ebc72e5283c882de73e3a4459137bb

Git Client Plugin 6.2.1 also includes fixes to support command line
git 2.51.0.  Those changes were originally from pull requests:

* jenkinsci/git-client-plugin#1326
* jenkinsci/git-client-plugin#1327

Fixed by pull request:

* jenkinsci/git-client-plugin#1332

Testing done:

I've run interactive tests with Git Client Plugin 6.2.1 incremental
build and found no issues.
@MarkEWaite MarkEWaite mentioned this pull request Sep 4, 2025
Merged
MarkEWaite added a commit to MarkEWaite/git-client-plugin that referenced this pull request Sep 4, 2025
@MarkEWaite
[JENKINS-76026] Do not show merges in changelog (jenkinsci#1327)
fd896f7 
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 MarkEWaite mentioned this pull request Sep 4, 2025
Merged
6 tasks
MarkEWaite added a commit that referenced this pull request Sep 4, 2025
@MarkEWaite
[JENKINS-76026] Do not show merges in changelog (#1327)
52db8fe 
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 to MarkEWaite/update-center2 that referenced this pull request Sep 4, 2025
@MarkEWaite
Mark SECURITY-3590 as also fixed in Git Client Plugin 6.1.4
f936098 
https://www.jenkins.io/security/advisory/2025-09-03/#SECURITY-3590 is
fixed by backporting the changes from Git Client Plugin 6.3.3

Backport from commit 20090a86c3ebc72e5283c882de73e3a4459137bb

Git Client Plugin 6.1.4 also includes fixes to support command line
git 2.51.0.  Those changes were originally from pull requests:

* jenkinsci/git-client-plugin#1326
* jenkinsci/git-client-plugin#1327

Fixed by pull request:

* jenkinsci/git-client-plugin#1333

Testing done:

I've run interactive tests with a Git Client Plugin 6.1.4 development
build and found no issues.  Details are described in pull request:

* jenkinsci/git-client-plugin#1333
Kevin-CB pushed a commit to jenkins-infra/update-center2 that referenced this pull request Sep 5, 2025
@MarkEWaite
Mark SECURITY-3590 as also fixed in Git Client Plugin 6.2.1 and 6.1.4 (…
82543ab 
…#887)

* Mark SECURITY-3590 as also fixed in Git Client Plugin 6.2.1

https://www.jenkins.io/security/advisory/2025-09-03/#SECURITY-3590 is
fixed by backporting the changes from Git Client Plugin 6.3.3

Backport from commit 20090a86c3ebc72e5283c882de73e3a4459137bb

Git Client Plugin 6.2.1 also includes fixes to support command line
git 2.51.0.  Those changes were originally from pull requests:

* jenkinsci/git-client-plugin#1326
* jenkinsci/git-client-plugin#1327

Fixed by pull request:

* jenkinsci/git-client-plugin#1332

Testing done:

I've run interactive tests with Git Client Plugin 6.2.1 incremental
build and found no issues.

* Mark SECURITY-3590 as also fixed in Git Client Plugin 6.1.4

https://www.jenkins.io/security/advisory/2025-09-03/#SECURITY-3590 is
fixed by backporting the changes from Git Client Plugin 6.3.3

Backport from commit 20090a86c3ebc72e5283c882de73e3a4459137bb

Git Client Plugin 6.1.4 also includes fixes to support command line
git 2.51.0.  Those changes were originally from pull requests:

* jenkinsci/git-client-plugin#1326
* jenkinsci/git-client-plugin#1327

Fixed by pull request:

* jenkinsci/git-client-plugin#1333

Testing done:

I've run interactive tests with a Git Client Plugin 6.1.4 development
build and found no issues.  Details are described in pull request:

* jenkinsci/git-client-plugin#1333
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

bug Incorrect or flawed behavior tests Automated test addition or improvement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@MarkEWaite