aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters75
-rw-r--r--org.eclipse.jgit/META-INF/MANIFEST.MF112
-rw-r--r--org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF4
-rw-r--r--org.eclipse.jgit/pom.xml2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java5
6 files changed, 64 insertions, 136 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
deleted file mode 100644
index 1408a9d00d..0000000000
--- a/org.eclipse.jgit/.settings/.api_filters
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jgit" version="2">
- <resource path="src/org/eclipse/jgit/diff/DiffDriver.java" type="org.eclipse.jgit.diff.DiffDriver">
- <filter id="1109393411">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="org.eclipse.jgit.diff.DiffDriver"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/diff/DiffFormatter.java" type="org.eclipse.jgit.diff.DiffFormatter">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="format(EditList, RawText, RawText, DiffDriver)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="format(FileHeader, RawText, RawText, DiffDriver)"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="writeHunkHeader(int, int, int, int, String)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="ATTR_BUILTIN_UNION_MERGE_DRIVER"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/merge/ContentMergeStrategy.java" type="org.eclipse.jgit.merge.ContentMergeStrategy">
- <filter id="1176502275">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="UNION"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
- <filter id="336658481">
- <message_arguments>
- <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
- <message_argument value="attributesNodeProvider"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="attributesNodeProvider"/>
- </message_arguments>
- </filter>
- <filter id="1142947843">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="setAttributesNodeProvider(AttributesNodeProvider)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/jgit/transport/UploadPack.java" type="org.eclipse.jgit.transport.UploadPack$RequestPolicy">
- <filter id="1176502275">
- <message_arguments>
- <message_argument value="6.10.1"/>
- <message_argument value="implies(UploadPack.RequestPolicy)"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 3c864fdc41..659ad8549f 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit
Bundle-SymbolicName: org.eclipse.jgit
-Bundle-Version: 7.1.1.qualifier
+Bundle-Version: 7.2.0.qualifier
Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml
Eclipse-ExtensibleAPI: true
-Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
- org.eclipse.jgit.api;version="7.1.1";
+Export-Package: org.eclipse.jgit.annotations;version="7.2.0",
+ org.eclipse.jgit.api;version="7.2.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.notes,
org.eclipse.jgit.dircache,
@@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.blame,
org.eclipse.jgit.merge",
- org.eclipse.jgit.api.errors;version="7.1.1";
+ org.eclipse.jgit.api.errors;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.errors",
- org.eclipse.jgit.attributes;version="7.1.1";
+ org.eclipse.jgit.attributes;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.blame;version="7.1.1";
+ org.eclipse.jgit.blame;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.diff",
- org.eclipse.jgit.diff;version="7.1.1";
+ org.eclipse.jgit.diff;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
@@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.dircache;version="7.1.1";
+ org.eclipse.jgit.dircache;version="7.2.0";
uses:="org.eclipse.jgit.events,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.errors;version="7.1.1";
+ org.eclipse.jgit.errors;version="7.2.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.internal.storage.pack",
- org.eclipse.jgit.events;version="7.1.1";
+ org.eclipse.jgit.events;version="7.2.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.fnmatch;version="7.1.1",
- org.eclipse.jgit.gitrepo;version="7.1.1";
+ org.eclipse.jgit.fnmatch;version="7.2.0",
+ org.eclipse.jgit.gitrepo;version="7.2.0";
uses:="org.xml.sax.helpers,
org.eclipse.jgit.api,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.xml.sax",
- org.eclipse.jgit.gitrepo.internal;version="7.1.1";x-internal:=true,
- org.eclipse.jgit.hooks;version="7.1.1";uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.ignore;version="7.1.1",
- org.eclipse.jgit.ignore.internal;version="7.1.1";
+ org.eclipse.jgit.gitrepo.internal;version="7.2.0";x-internal:=true,
+ org.eclipse.jgit.hooks;version="7.2.0";uses:="org.eclipse.jgit.lib",
+ org.eclipse.jgit.ignore;version="7.2.0",
+ org.eclipse.jgit.ignore.internal;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal;version="7.1.1";
+ org.eclipse.jgit.internal;version="7.2.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.test",
- org.eclipse.jgit.internal.diff;version="7.1.1";
+ org.eclipse.jgit.internal.diff;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.diffmergetool;version="7.1.1";
+ org.eclipse.jgit.internal.diffmergetool;version="7.2.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.pgm.test,
org.eclipse.jgit.pgm,
org.eclipse.egit.ui",
- org.eclipse.jgit.internal.fsck;version="7.1.1";
+ org.eclipse.jgit.internal.fsck;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.revwalk;version="7.1.1";
+ org.eclipse.jgit.internal.revwalk;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.commitgraph;version="7.1.1";
+ org.eclipse.jgit.internal.storage.commitgraph;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.dfs;version="7.1.1";
+ org.eclipse.jgit.internal.storage.dfs;version="7.2.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.http.server,
org.eclipse.jgit.http.test,
org.eclipse.jgit.lfs.test",
- org.eclipse.jgit.internal.storage.file;version="7.1.1";
+ org.eclipse.jgit.internal.storage.file;version="7.2.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.junit.http,
@@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
org.eclipse.jgit.pgm,
org.eclipse.jgit.pgm.test,
org.eclipse.jgit.ssh.apache",
- org.eclipse.jgit.internal.storage.io;version="7.1.1";
+ org.eclipse.jgit.internal.storage.io;version="7.2.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.memory;version="7.1.1";
+ org.eclipse.jgit.internal.storage.memory;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.storage.pack;version="7.1.1";
+ org.eclipse.jgit.internal.storage.pack;version="7.2.0";
x-friends:="org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.storage.reftable;version="7.1.1";
+ org.eclipse.jgit.internal.storage.reftable;version="7.2.0";
x-friends:="org.eclipse.jgit.http.test,
org.eclipse.jgit.junit,
org.eclipse.jgit.test,
org.eclipse.jgit.pgm",
- org.eclipse.jgit.internal.submodule;version="7.1.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.connectivity;version="7.1.1";
+ org.eclipse.jgit.internal.submodule;version="7.2.0";x-internal:=true,
+ org.eclipse.jgit.internal.transport.connectivity;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.http;version="7.1.1";
+ org.eclipse.jgit.internal.transport.http;version="7.2.0";
x-friends:="org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.parser;version="7.1.1";
+ org.eclipse.jgit.internal.transport.parser;version="7.2.0";
x-friends:="org.eclipse.jgit.http.server,
org.eclipse.jgit.test",
- org.eclipse.jgit.internal.transport.ssh;version="7.1.1";
+ org.eclipse.jgit.internal.transport.ssh;version="7.2.0";
x-friends:="org.eclipse.jgit.ssh.apache,
org.eclipse.jgit.ssh.jsch,
org.eclipse.jgit.test",
- org.eclipse.jgit.internal.util;version="7.1.1";
+ org.eclipse.jgit.internal.util;version="7.2.0";
x-friends:=" org.eclipse.jgit.junit",
- org.eclipse.jgit.lib;version="7.1.1";
+ org.eclipse.jgit.lib;version="7.2.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.sha1,
org.eclipse.jgit.dircache,
@@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
org.eclipse.jgit.util,
org.eclipse.jgit.submodule,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.lib.internal;version="7.1.1";
+ org.eclipse.jgit.lib.internal;version="7.2.0";
x-friends:="org.eclipse.jgit.test,
org.eclipse.jgit.pgm,
org.eclipse.egit.ui",
- org.eclipse.jgit.logging;version="7.1.1",
- org.eclipse.jgit.merge;version="7.1.1";
+ org.eclipse.jgit.logging;version="7.2.0",
+ org.eclipse.jgit.merge;version="7.2.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
@@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
org.eclipse.jgit.util,
org.eclipse.jgit.api,
org.eclipse.jgit.attributes",
- org.eclipse.jgit.nls;version="7.1.1",
- org.eclipse.jgit.notes;version="7.1.1";
+ org.eclipse.jgit.nls;version="7.2.0",
+ org.eclipse.jgit.notes;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.merge",
- org.eclipse.jgit.patch;version="7.1.1";
+ org.eclipse.jgit.patch;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff",
- org.eclipse.jgit.revplot;version="7.1.1";
+ org.eclipse.jgit.revplot;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk",
- org.eclipse.jgit.revwalk;version="7.1.1";
+ org.eclipse.jgit.revwalk;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.revwalk.filter,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.revwalk.filter;version="7.1.1";
+ org.eclipse.jgit.revwalk.filter;version="7.2.0";
uses:="org.eclipse.jgit.revwalk,
org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.file;version="7.1.1";
+ org.eclipse.jgit.storage.file;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.util",
- org.eclipse.jgit.storage.pack;version="7.1.1";
+ org.eclipse.jgit.storage.pack;version="7.2.0";
uses:="org.eclipse.jgit.lib",
- org.eclipse.jgit.submodule;version="7.1.1";
+ org.eclipse.jgit.submodule;version="7.2.0";
uses:="org.eclipse.jgit.lib,
org.eclipse.jgit.diff,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.treewalk,
org.eclipse.jgit.util",
- org.eclipse.jgit.transport;version="7.1.1";
+ org.eclipse.jgit.transport;version="7.2.0";
uses:="javax.crypto,
org.eclipse.jgit.util.io,
org.eclipse.jgit.lib,
@@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.storage.pack,
org.eclipse.jgit.errors",
- org.eclipse.jgit.transport.http;version="7.1.1";
+ org.eclipse.jgit.transport.http;version="7.2.0";
uses:="javax.net.ssl",
- org.eclipse.jgit.transport.resolver;version="7.1.1";
+ org.eclipse.jgit.transport.resolver;version="7.2.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.lib",
- org.eclipse.jgit.treewalk;version="7.1.1";
+ org.eclipse.jgit.treewalk;version="7.2.0";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.attributes,
org.eclipse.jgit.revwalk,
org.eclipse.jgit.treewalk.filter,
org.eclipse.jgit.util",
- org.eclipse.jgit.treewalk.filter;version="7.1.1";
+ org.eclipse.jgit.treewalk.filter;version="7.2.0";
uses:="org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util;version="7.1.1";
+ org.eclipse.jgit.util;version="7.2.0";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.hooks,
org.eclipse.jgit.revwalk,
@@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1",
org.eclipse.jgit.treewalk,
javax.net.ssl,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.util.io;version="7.1.1";
+ org.eclipse.jgit.util.io;version="7.2.0";
uses:="org.eclipse.jgit.attributes,
org.eclipse.jgit.lib,
org.eclipse.jgit.treewalk",
- org.eclipse.jgit.util.sha1;version="7.1.1",
- org.eclipse.jgit.util.time;version="7.1.1"
+ org.eclipse.jgit.util.sha1;version="7.2.0",
+ org.eclipse.jgit.util.time;version="7.2.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
javax.crypto,
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index df2e804924..0f9ec1fb22 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.jgit - Sources
Bundle-SymbolicName: org.eclipse.jgit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 7.1.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.1.qualifier";roots="."
+Bundle-Version: 7.2.0.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="."
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
index 1805206ec1..df7ae83647 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>7.1.1-SNAPSHOT</version>
+ <version>7.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit</artifactId>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java
index 6375a60383..cbac3f90b7 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java
@@ -1334,7 +1334,7 @@ public class DiffFormatter implements AutoCloseable {
continue;
}
if (matchesAny(diffDriver.getMatchPatterns(), line)) {
- String funcName = line.replaceAll("^[ \\t]+", "");
+ String funcName = line.replaceAll("^[ \\t]+", ""); //$NON-NLS-1$//$NON-NLS-2$
return funcName.substring(0,
Math.min(funcName.length(), 80)).trim();
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
index aaac2a72e0..f66b3f65de 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java
@@ -38,12 +38,12 @@ import org.eclipse.jgit.lib.AnyObjectId;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.CoreConfig.EolStreamType;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.MutableObjectId;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.CoreConfig.EolStreamType;
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.treewalk.filter.PathFilter;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
@@ -1591,6 +1591,9 @@ public class TreeWalk implements AutoCloseable, AttributesProvider {
String filterCommand = filterCommandsByNameDotType.get(key);
if (filterCommand != null)
return filterCommand;
+ if (config == null) {
+ return null;
+ }
filterCommand = config.getString(ConfigConstants.CONFIG_FILTER_SECTION,
filterDriverName, filterCommandType);
boolean useBuiltin = config.getBoolean(
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 13:26:35 +0000