aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2024-08-18 18:35:29 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2024-08-18 18:35:29 +0200
commitcfc08fa973b514b618162d69dfe0caad796ee33f (patch)
tree55ec51fb7783fa41db5edc720a8b89ad2181b6f8
parent6efb60bfa39f34de76e907c8b9c44d84bb230299 (diff)
parent9e484a5cc575b470e950151f5be82162fb29d506 (diff)
downloadjgit-stable-6.5.tar.gz
jgit-stable-6.5.zip
Merge branch 'stable-6.4' into stable-6.5stable-6.5
* stable-6.4: 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: Ieae366586ac4c449a4f9454dc4b63513e7573776
-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 37c86135b5..374422660e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -397,7 +397,7 @@
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.0</version>
</plugin>
</plugins>
</pluginManagement>