diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-17 14:04:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-17 14:04:43 -0400 |
| commit | 615053c624b357520ef01db60c58e60d848a44bd (patch) | |
| tree | 90bcd7299da5767ddab3eaabb335c55b9a13a9be /Types | |
| parent | 5b64144c2fb989f9799c1ec328b442b504b1d10f (diff) | |
post-recive hook to make updateInstead work in direct mode and adjusted branches
* Added post-recieve hook, which makes updateInstead work with direct
mode and adjusted branches.
* init: Set up the post-receive hook.
This commit was sponsored by Fernando Jimenez on Patreon.
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/GitConfig.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index fb25f2f26..af901fcf1 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -18,7 +18,7 @@ import Common import qualified Git import qualified Git.Config import qualified Git.Construct -import Git.SharedRepository +import Git.ConfigTypes import Utility.DataUnits import Config.Cost import Types.UUID @@ -84,6 +84,7 @@ data GitConfig = GitConfig , annexAddUnlocked :: Bool , coreSymlinks :: Bool , coreSharedRepository :: SharedRepository + , receiveDenyCurrentBranch :: DenyCurrentBranch , gcryptId :: Maybe String , gpgCmd :: GpgCmd } @@ -137,6 +138,7 @@ extractGitConfig r = GitConfig , annexAddUnlocked = getbool (annex "addunlocked") False , coreSymlinks = getbool "core.symlinks" True , coreSharedRepository = getSharedRepository r + , receiveDenyCurrentBranch = getDenyCurrentBranch r , gcryptId = getmaybe "core.gcrypt-id" , gpgCmd = mkGpgCmd (getmaybe "gpg.program") } |