From 8471df3b6dd3710ab880523b358e6f5140299421 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 16 Sep 2020 11:16:48 -0400
Subject: [PATCH] rename Configurable for clarity

---
 Config/GitConfig.hs |  4 ++--
 Types/GitConfig.hs  | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Config/GitConfig.hs b/Config/GitConfig.hs
index d01ca64083..d78047c212 100644
--- a/Config/GitConfig.hs
+++ b/Config/GitConfig.hs
@@ -20,13 +20,13 @@ import Logs.Config
  - Note: Be sure to add the config to mergeGitConfig and to
  - globalConfigs.
  -}
-getGitConfigVal :: (GitConfig -> Configurable a) -> Annex a
+getGitConfigVal :: (GitConfig -> GlobalConfigurable a) -> Annex a
 getGitConfigVal f = getGitConfigVal' f >>= \case
 	HasGlobalConfig c -> return c
 	DefaultConfig d -> return d
 	HasGitConfig c -> return c
 
-getGitConfigVal' :: (GitConfig -> Configurable a) -> Annex (Configurable a)
+getGitConfigVal' :: (GitConfig -> GlobalConfigurable a) -> Annex (GlobalConfigurable a)
 getGitConfigVal' f = (f <$> Annex.getGitConfig) >>= \case
 	DefaultConfig _ -> do
 		r <- Annex.gitRepo
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs
index ab586b063a..c4e3abbf8e 100644
--- a/Types/GitConfig.hs
+++ b/Types/GitConfig.hs
@@ -9,7 +9,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 module Types.GitConfig ( 
-	Configurable(..),
+	GlobalConfigurable(..),
 	ConfigSource(..),
 	GitConfig(..),
 	extractGitConfig,
@@ -53,7 +53,7 @@ import qualified Data.ByteString as B
 
 -- | A configurable value, that may not be fully determined yet because
 -- the global git config has not yet been loaded.
-data Configurable a
+data GlobalConfigurable a
 	= HasGitConfig a
 	-- ^ The git config has a value.
 	| HasGlobalConfig a
@@ -84,17 +84,17 @@ data GitConfig = GitConfig
 	, annexDelayAdd :: Maybe Int
 	, annexHttpHeaders :: [String]
 	, annexHttpHeadersCommand :: Maybe String
-	, annexAutoCommit :: Configurable Bool
-	, annexResolveMerge :: Configurable Bool
-	, annexSyncContent :: Configurable Bool
-	, annexSyncOnlyAnnex :: Configurable Bool
+	, annexAutoCommit :: GlobalConfigurable Bool
+	, annexResolveMerge :: GlobalConfigurable Bool
+	, annexSyncContent :: GlobalConfigurable Bool
+	, annexSyncOnlyAnnex :: GlobalConfigurable Bool
 	, annexDebug :: Bool
 	, annexWebOptions :: [String]
 	, annexYoutubeDlOptions :: [String]
 	, annexAriaTorrentOptions :: [String]
 	, annexCrippledFileSystem :: Bool
-	, annexLargeFiles :: Configurable (Maybe String)
-	, annexDotFiles :: Configurable Bool
+	, annexLargeFiles :: GlobalConfigurable (Maybe String)
+	, annexDotFiles :: GlobalConfigurable Bool
 	, annexGitAddToAnnex :: Bool
 	, annexAddSmallFiles :: Bool
 	, annexFsckNudge :: Bool
@@ -111,7 +111,7 @@ data GitConfig = GitConfig
 	, annexVerify :: Bool
 	, annexPidLock :: Bool
 	, annexPidLockTimeout :: Seconds
-	, annexAddUnlocked :: Configurable (Maybe String)
+	, annexAddUnlocked :: GlobalConfigurable (Maybe String)
 	, annexSecureHashesOnly :: Bool
 	, annexRetry :: Maybe Integer
 	, annexForwardRetry :: Maybe Integer