summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-27 16:08:16 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-27 16:08:23 -0400
commit025b8102e5741f437e970eb29593ced31b0554e4 (patch)
tree9c6d4376dfd3740c4c0f902bae6015278b23d0b0 /Command
parentacaaf842b5afbf3e6d0c0095cbe15699ab2419d3 (diff)
inheritable annex.securehashesonly
* init: When annex.securehashesonly has been set with git-annex config, copy that value to the annex.securehashesonly git config. * config --set: As well as setting value in git-annex branch, set local gitconfig. This is needed especially for annex.securehashesonly, which is read only from local gitconfig and not the git-annex branch. doc/todo/sha1_collision_embedding_in_git-annex_keys.mdwn has the rationalle for doing it this way. There's no perfect solution; this seems to be the least-bad one. This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Command')
-rw-r--r--Command/Config.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/Command/Config.hs b/Command/Config.hs
index c9b6a7b0b..5da196044 100644
--- a/Command/Config.hs
+++ b/Command/Config.hs
@@ -9,6 +9,7 @@ module Command.Config where
import Command
import Logs.Config
+import Config
cmd :: Command
cmd = noMessages $ command "config" SectionSetup
@@ -52,12 +53,14 @@ seek (SetConfig name val) = commandAction $ do
showStart name val
next $ next $ do
setGlobalConfig name val
+ setConfig (ConfigKey name) val
return True
seek (UnsetConfig name) = commandAction $ do
allowMessages
showStart name "unset"
next $ next $ do
unsetGlobalConfig name
+ unsetConfig (ConfigKey name)
return True
seek (GetConfig name) = commandAction $ do
mv <- getGlobalConfig name