summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2024-08-20 14:28:33 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2024-08-20 14:28:33 +0200
commitf9cc863220814d70440766c3ac80c61bc69cae4f (patch)
tree7f7c143dbd11255d7d722cae1eac57e3589810a8
parentcc353f97be313ecc531ee44111caa910daffdfd7 (diff)
parentcfc08fa973b514b618162d69dfe0caad796ee33f (diff)
downloadjgit-f9cc863220814d70440766c3ac80c61bc69cae4f.tar.gz
jgit-f9cc863220814d70440766c3ac80c61bc69cae4f.zip
Merge branch 'stable-6.5' into stable-6.6
* stable-6.5: Update org.eclipse.dash:license-tool-plugin to 1.1.0 Fix "Comparison of narrow type with wide type in loop condition" JGit v5.13.3.202401111512-r Change-Id: I54d1776b3ea096d458b8005e70c02e7edef71c2b
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java2
-rw-r--r--pom.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java
index d9669044c7..9bb38bbef4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java
@@ -530,7 +530,7 @@ public abstract class PackParser {
receiving.beginTask(JGitText.get().receivingObjects,
(int) expectedObjectCount);
try {
- for (int done = 0; done < expectedObjectCount; done++) {
+ for (long done = 0; done < expectedObjectCount; done++) {
indexOneObject();
receiving.update(1);
if (receiving.isCancelled())
diff --git a/pom.xml b/pom.xml
index 873958ccf0..8cbd5d5b03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,7 +393,7 @@
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0</version>
</plugin>
</plugins>
</pluginManagement>