Update jgit from 7.4 to 7.6.

adjusted RevWalk max flags constant since it diverges from javadoc and
added tripwire test in case it changes again in future.

Author: mbien

ide/libs.git/src/org/netbeans/libs/git/jgit/commands/LogCommand.java

@@ -81,6 +81,9 @@ public class LogCommand extends GitCommand {
     private final boolean fetchBranchInfo;
     private static final Logger LOG = Logger.getLogger(LogCommand.class.getName());
 
+    /// see RevWalk.newFlag(); note: don't trust the doc! check RevWalk.RESERVED_FLAGS
+    static final int MAX_REVWALK_FLAGS = 23;
+
     public LogCommand (Repository repository, GitClassFactory gitFactory, SearchCriteria criteria,
             boolean fetchBranchInfo, ProgressMonitor monitor, RevisionInfoListener listener) {
         super(repository, gitFactory, monitor);
@@ -210,7 +213,7 @@ private void markBranchFlags (Map<String, GitBranch> allBranches, RevWalk walk,
                     }
                 } else {
                     usedFlags.add(flagId);
-                    if (i <= 23) { // leave one spare flag for the run method, see RevWalk.newFlag()
+                    if (i <= MAX_REVWALK_FLAGS - 1) { // leave one spare flag for the run method
                         i++;
                         RevFlag flag = walk.newFlag(flagId);
                         List<GitBranch> branches = new ArrayList<>(allBranches.size());

ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/LogTest.java

@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.Date;
 import java.util.Map;
 import org.eclipse.jgit.api.Git;
@@ -59,6 +60,15 @@ protected void setUp() throws Exception {
         repository = getRepository(getLocalGitRepository());
     }
 
+    // doc promises 24, but the actual number was observed to be lower since 7.5
+    // this is a tripwire test to detect changes
+    public void testMaxApplicationFlagCount() throws Exception {
+        Field field = RevWalk.class.getDeclaredField("RESERVED_FLAGS");
+        field.setAccessible(true);
+        int available = 32 - (int) field.get(null);
+        assertEquals(LogCommand.MAX_REVWALK_FLAGS, available); // if this fails, adjust the value
+    }
+
     public void testLogRevision () throws Exception {
         File f = new File(workDir, "testcat1");
         write(f, "initial content");

ide/o.eclipse.jgit.gpg.bc/external/binaries-list

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-33787FA12A5F0457C2028FA1DA4517AC8EB3DDF7 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.4.0.202509020913-r
+FD8967B5C67D63796C4665116AFA85F3D0A4D130 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.6.0.202603022253-r

….gpg.bc-7.4.0.202509020913-r-license.txt ….gpg.bc-7.6.0.202603022253-r-license.txtide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-r-license.txt renamed to ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.6.0.202603022253-r-license.txt ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-r-license.txt renamed to ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.6.0.202603022253-r-license.txt

@@ -1,6 +1,6 @@
 Name: JGit Library
 Origin: Eclipse
-Version: 7.4.0.202509020913-r
+Version: 7.6.0.202603022253-r
 Description: Integration library for Git client
 License: EDL-1.0-jgit
 URL: http://www.eclipse.org/jgit/download/

ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties

@@ -17,4 +17,4 @@
 
 is.autoload=true
 
-release.external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-r.jar=modules/org-eclipse-jgit-gpg-bc.jar
+release.external/org.eclipse.jgit.gpg.bc-7.6.0.202603022253-r.jar=modules/org-eclipse-jgit-gpg-bc.jar

ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml

@@ -65,7 +65,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>org-eclipse-jgit-gpg-bc.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.jgit.gpg.bc-7.4.0.202509020913-r.jar</binary-origin>
+                <binary-origin>external/org.eclipse.jgit.gpg.bc-7.6.0.202603022253-r.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/o.eclipse.jgit.lfs/external/binaries-list

@@ -14,4 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-D47A51B1257A577DB9388386F60953CFB066450C org.eclipse.jgit:org.eclipse.jgit.lfs:7.4.0.202509020913-r
+EA88518D6722FA4B3A7BBA8FE8233BC2B22B02C9 org.eclipse.jgit:org.eclipse.jgit.lfs:7.6.0.202603022253-r

…git.lfs-7.4.0.202509020913-r-license.txt …git.lfs-7.6.0.202603022253-r-license.txtide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.4.0.202509020913-r-license.txt renamed to ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.6.0.202603022253-r-license.txt ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.4.0.202509020913-r-license.txt renamed to ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.6.0.202603022253-r-license.txt

@@ -1,6 +1,6 @@
 Name: JGit Library
 Origin: Eclipse
-Version: 7.4.0.202509020913-r
+Version: 7.6.0.202603022253-r
 Description: Integration library for Git client
 License: EDL-1.0-jgit
 URL: http://www.eclipse.org/jgit/download/

ide/o.eclipse.jgit.lfs/nbproject/project.properties

@@ -17,4 +17,4 @@
 
 is.autoload=true
 
-release.external/org.eclipse.jgit.lfs-7.4.0.202509020913-r.jar=modules/org-eclipse-jgit-lfs.jar
+release.external/org.eclipse.jgit.lfs-7.6.0.202603022253-r.jar=modules/org-eclipse-jgit-lfs.jar

ide/o.eclipse.jgit.lfs/nbproject/project.xml

@@ -60,7 +60,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>org-eclipse-jgit-lfs.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.jgit.lfs-7.4.0.202509020913-r.jar</binary-origin>
+                <binary-origin>external/org.eclipse.jgit.lfs-7.6.0.202603022253-r.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>