diff options
Diffstat (limited to 'org.eclipse.jgit.lfs')
4 files changed, 29 insertions, 26 deletions
diff --git a/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs index ce7a0f0478..984263dd94 100644 --- a/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/org.eclipse.jgit.lfs/.settings/org.eclipse.mylyn.team.ui.prefs @@ -1,2 +1,2 @@ -commit.comment.template=${task.description} \n\nBug\: ${task.key} +commit.comment.template=${task.description}\n\nBug\: ${task.key} eclipse.preferences.version=1 diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 8785903456..f3ab7fc038 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,33 +3,33 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.1.3.qualifier +Bundle-Version: 5.2.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name -Export-Package: org.eclipse.jgit.lfs;version="5.1.3", - org.eclipse.jgit.lfs.errors;version="5.1.3", - org.eclipse.jgit.lfs.internal;version="5.1.3";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="5.1.3" +Export-Package: org.eclipse.jgit.lfs;version="5.2.0", + org.eclipse.jgit.lfs.errors;version="5.2.0", + org.eclipse.jgit.lfs.internal;version="5.2.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="5.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", org.apache.http.impl.client;version="[4.2.6,5.0.0)", org.apache.http.impl.conn;version="[4.2.6,5.0.0)", - org.eclipse.jgit.annotations;version="[5.1.3,5.2.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[5.1.3,5.2.0)", - org.eclipse.jgit.attributes;version="[5.1.3,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.3,5.2.0)", - org.eclipse.jgit.errors;version="[5.1.3,5.2.0)", - org.eclipse.jgit.hooks;version="[5.1.3,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="[5.1.3,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.3,5.2.0)", - org.eclipse.jgit.nls;version="[5.1.3,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.3,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.3,5.2.0)", - org.eclipse.jgit.storage.pack;version="[5.1.3,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.3,5.2.0)", - org.eclipse.jgit.transport.http;version="[5.1.3,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.3,5.2.0)", - org.eclipse.jgit.treewalk.filter;version="[5.1.3,5.2.0)", - org.eclipse.jgit.util;version="[5.1.3,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.3,5.2.0)" + org.eclipse.jgit.annotations;version="[5.2.0,5.3.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[5.2.0,5.3.0)", + org.eclipse.jgit.attributes;version="[5.2.0,5.3.0)", + org.eclipse.jgit.diff;version="[5.2.0,5.3.0)", + org.eclipse.jgit.errors;version="[5.2.0,5.3.0)", + org.eclipse.jgit.hooks;version="[5.2.0,5.3.0)", + org.eclipse.jgit.internal.storage.file;version="[5.2.0,5.3.0)", + org.eclipse.jgit.lib;version="[5.2.0,5.3.0)", + org.eclipse.jgit.nls;version="[5.2.0,5.3.0)", + org.eclipse.jgit.revwalk;version="[5.2.0,5.3.0)", + org.eclipse.jgit.storage.file;version="[5.2.0,5.3.0)", + org.eclipse.jgit.storage.pack;version="[5.2.0,5.3.0)", + org.eclipse.jgit.transport;version="[5.2.0,5.3.0)", + org.eclipse.jgit.transport.http;version="[5.2.0,5.3.0)", + org.eclipse.jgit.treewalk;version="[5.2.0,5.3.0)", + org.eclipse.jgit.treewalk.filter;version="[5.2.0,5.3.0)", + org.eclipse.jgit.util;version="[5.2.0,5.3.0)", + org.eclipse.jgit.util.io;version="[5.2.0,5.3.0)" diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index d2ec285c9e..f49b8b6c75 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.1.3-SNAPSHOT</version> + <version>5.2.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs</artifactId> diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java index fac87c177e..7bacf49269 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/SmudgeFilter.java @@ -222,7 +222,10 @@ public class SmudgeFilter extends FilterCommand { Integer.valueOf(responseCode))); } Path path = lfs.getMediaFile(ptr.getOid()); - path.getParent().toFile().mkdirs(); + Path parent = path.getParent(); + if (parent != null) { + parent.toFile().mkdirs(); + } try (InputStream contentIn = contentServerConn .getInputStream()) { long bytesCopied = Files.copy(contentIn, path); |