Merge branch 'stable-6.10' * stable-6.10: 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" RepoProject: read the 'dest-branch' attribute of a project Make RepoProject#setUpstream public RepoCommand: Add error to ManifestErrorException RepoCommand: Copy manifest upstream into .gitmodules ref field RepoProject: read the "upstream" attribute of a project JGit v5.13.3.202401111512-r Change-Id: If67534f8954703e107e8477456325af3d868612c
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 4274c94..657b90f 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml
@@ -30,7 +30,7 @@ <properties> <java.version>17</java.version> - <tycho-version>4.0.7</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/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters new file mode 100644 index 0000000..50a04d2 --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters
@@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit" version="2"> + <resource path="src/org/eclipse/jgit/gitrepo/RepoProject.java" type="org.eclipse.jgit.gitrepo.RepoProject"> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="6.10"/> + <message_argument value="getDestBranch()"/> + </message_arguments> + </filter> + <filter id="1141899266"> + <message_arguments> + <message_argument value="7.0"/> + <message_argument value="6.10"/> + <message_argument value="setDestBranch(String)"/> + </message_arguments> + </filter> + </resource> +</component>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index d8fec78..2630da3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java
@@ -396,7 +396,7 @@ public void clearLinkFiles() { * * @return the upstream value if present, null otherwise. * - * @since 7.0 + * @since 6.10 */ public String getUpstream() { return this.upstream; @@ -407,7 +407,7 @@ public String getUpstream() { * * @return the dest-branch value if present, null otherwise. * - * @since 7.0 + * @since 6.10 */ public String getDestBranch() { return this.destBranch; @@ -422,7 +422,7 @@ public String getDestBranch() { * @param upstream * value of the attribute in the manifest * - * @since 7.0 + * @since 6.10 */ public void setUpstream(String upstream) { this.upstream = upstream; @@ -436,7 +436,7 @@ public void setUpstream(String upstream) { * @param destBranch * value of the attribute in the manifest * - * @since 7.0 + * @since 6.10 */ public void setDestBranch(String destBranch) { this.destBranch = destBranch;
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 7224405..e1f2b19 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 PackLock parse(ProgressMonitor receiving, ProgressMonitor resolving) 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())