From 60b43c03e218a7c94257105820b790e8dbc0ab6f Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 5 Mar 2018 10:53:12 +0900 Subject: Add ConfigConstants.CONFIG_SECTION_LFS DirCacheCheckout has a warning about non-localised string "lfs". Other classes use org.eclipse.jgit.lfs.lib.Constants but that is not visible to DirCacheCheckout. Add a new constant in ConfigConstants and use that in DirCacheCheckout. Replace existing uses of org.eclipse.jgit.lfs.lib.Constants.LFS with the new constant, except where it is referring to the folder name. Change-Id: I0f21b951babff9a2e579d68c4de0c62ee4bc23d4 Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal') 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 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 -- cgit v1.2.3