diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-08-20 15:20:37 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-08-20 15:20:37 +0200 |
| commit | 91426e8c90dff0370914bf4989dd136a26a3a9f5 (patch) | |
| tree | 8e513d5972a20915be9dc37998c4715c570a1da2 | |
| parent | e61c20b1ebd82bfc5cf6aa63c8a77aad354a992d (diff) | |
| parent | 7dceb15e53a533843b964203bdc2e8d07a32a436 (diff) | |
| download | jgit-91426e8c90dff0370914bf4989dd136a26a3a9f5.tar.gz jgit-91426e8c90dff0370914bf4989dd136a26a3a9f5.zip | |
Merge branch 'stable-6.8' into stable-6.9
* stable-6.8:
Update tycho to 4.0.8
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: I29478165b8304316713ffd6a4c6d669dd5760c88
| -rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index e9c7ac5a24..c06d6e41da 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -30,7 +30,7 @@ <properties> <java.version>11</java.version> - <tycho-version>4.0.6</tycho-version> + <tycho-version>4.0.8</tycho-version> <target-platform>jgit-4.17</target-platform> <project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp> </properties> 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 7224405df7..e1f2b19ce5 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()) |