diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-03-02 16:43:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-02 16:43:44 -0400 |
| commit | 9b4db1bab69b678a13a1d0d2ca74a48626364c93 (patch) | |
| tree | cab518e0c5b6575509fc36ebb23ff686cb3007f2 /Config.hs | |
| parent | 8f4da219cd9989092afa6a8873421894a6f73eb4 (diff) | |
Submodules are now supported by git-annex!
Seems to work, but still experimental until it's been tested more.
When repositories are on filesystems not supporting symlinks, the .git dir
symlink trick cannot be used. Since we're going to be in direct mode
anyway, the .git dir symlink is not strictly needed.
However, I have not fixed the code that creates new annex symlinks to
handle this case -- the committed symlinks will be wrong.
git annex sync happens to currently fail in a submodule using direct mode,
because there's no HEAD ref. That also needs to be dealt with to get
this fully working in crippled filesystems.
Leaving http://github.com/datalad/datalad/issues/44 open until these issues
are dealt with.
Diffstat (limited to 'Config.hs')
| -rw-r--r-- | Config.hs | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -37,13 +37,9 @@ setConfig (ConfigKey key) value = do reloadConfig :: Annex () reloadConfig = Annex.changeGitRepo =<< inRepo Git.Config.reRead -{- Unsets a git config setting. (Leaves it in state currently.) -} +{- Unsets a git config setting. (Leaves it in state.) -} unsetConfig :: ConfigKey -> Annex () -unsetConfig ck@(ConfigKey key) = ifM (isJust <$> getConfigMaybe ck) - ( inRepo $ Git.Command.run - [Param "config", Param "--unset", Param key] - , noop -- avoid unsetting something not set; that would fail - ) +unsetConfig (ConfigKey key) = void $ inRepo $ Git.Config.unset key {- A per-remote config setting in git config. -} remoteConfig :: Git.Repo -> UnqualifiedConfigKey -> ConfigKey |