Skip to content

Use JGit 7.5.0 #1367

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.

Sign up for GitHub

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

Merged
MarkEWaite merged 3 commits into from
Dec 12, 2025
Merged

Use JGit 7.5.0 #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
877a14f
Limit JGit to search 23 branches instead of 24
MarkEWaite Dec 8, 2025
ca65c16
Bump jgit.version from 7.4.0.202509020913-r to 7.5.0.202512021534-r
dependabot[bot] Dec 8, 2025
1fe9cf6
Prepare for 6.5.0 release
MarkEWaite Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</scm>

<properties>
<revision>6.4.2</revision>
<revision>6.5.0</revision>
<changelist>-SNAPSHOT</changelist>
<!-- Character set tests fail unless file.encoding is set -->
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
Expand All @@ -42,7 +42,7 @@
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.504</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<jgit.version>7.4.0.202509020913-r</jgit.version>
<jgit.version>7.5.0.202512021534-r</jgit.version>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
<spotless.check.skip>false</spotless.check.skip>
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2714,10 +2714,11 @@ public List<Branch> getBranchesContaining(String revspec, boolean allBranches)
}
RevCommit target = walk.parseCommit(id);

// we can track up to 24 flags at a time in JGit, so that's how many branches we will traverse in every
// iteration
List<RevFlag> flags = new ArrayList<>(24);
for (int i = 0; i < 24; i++) {
// we can track up to 23 flags at a time in JGit, so that's how many branches we will traverse in every
// iteration. Changed from 24 to 23 in JGit 7.5.0 with the additional of the global UNSHALLOW
final int MAX_FLAGS = 23;
List<RevFlag> flags = new ArrayList<>(MAX_FLAGS);
for (int i = 0; i < MAX_FLAGS; i++) {
flags.add(walk.newFlag("branch" + i));
}
walk.carry(flags);
Expand Down
Loading