diff options
Diffstat (limited to 'org.eclipse.jgit.lfs')
3 files changed, 12 insertions, 9 deletions
diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java index e1b9e34ed5..d65e4e9993 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java @@ -49,7 +49,6 @@ import java.io.PrintStream; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.attributes.Attribute; import org.eclipse.jgit.hooks.PrePushHook; -import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.Repository; @@ -118,7 +117,8 @@ public class BuiltinLFS extends LfsFactory { return false; } return db.getConfig().getBoolean(ConfigConstants.CONFIG_FILTER_SECTION, - Constants.LFS, ConfigConstants.CONFIG_KEY_USEJGITBUILTIN, + ConfigConstants.CONFIG_SECTION_LFS, + ConfigConstants.CONFIG_KEY_USEJGITBUILTIN, false); } @@ -134,7 +134,8 @@ public class BuiltinLFS extends LfsFactory { if (attribute == null) { return false; } - return isEnabled(db) && Constants.LFS.equals(attribute.getValue()); + return isEnabled(db) && ConfigConstants.CONFIG_SECTION_LFS + .equals(attribute.getValue()); } } diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java index f9e863c0fc..b204d0c156 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/InstallLfsCommand.java @@ -48,7 +48,6 @@ import java.util.concurrent.Callable; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lfs.internal.LfsText; -import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; @@ -81,9 +80,11 @@ public class InstallLfsCommand implements Callable<Void>{ cfg = repository.getConfig(); } - cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, Constants.LFS, + cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_USEJGITBUILTIN, true); - cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, Constants.LFS, + cfg.setBoolean(ConfigConstants.CONFIG_FILTER_SECTION, + ConfigConstants.CONFIG_SECTION_LFS, ConfigConstants.CONFIG_KEY_REQUIRED, true); cfg.save(); diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java index 3196e0730e..5d8268b73e 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java @@ -61,7 +61,6 @@ import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.lfs.LfsPointer; import org.eclipse.jgit.lfs.Protocol; import org.eclipse.jgit.lfs.errors.LfsConfigInvalidException; -import org.eclipse.jgit.lfs.lib.Constants; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; @@ -131,12 +130,14 @@ public class LfsConnectionFactory { Map<String, String> additionalHeaders) throws LfsConfigInvalidException { StoredConfig config = db.getConfig(); - String lfsUrl = config.getString(Constants.LFS, null, + String lfsUrl = config.getString(ConfigConstants.CONFIG_SECTION_LFS, + null, ConfigConstants.CONFIG_KEY_URL); if (lfsUrl == null) { String remoteUrl = null; for (String remote : db.getRemoteNames()) { - lfsUrl = config.getString(Constants.LFS, remote, + lfsUrl = config.getString(ConfigConstants.CONFIG_SECTION_LFS, + remote, ConfigConstants.CONFIG_KEY_URL); // This could be done better (more precise logic), but according // to https://github.com/git-lfs/git-lfs/issues/1759 git-lfs |