diff options
Diffstat (limited to 'Command/Init.hs')
| -rw-r--r-- | Command/Init.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Command/Init.hs b/Command/Init.hs index 47ac8e4c0..e780c8863 100644 --- a/Command/Init.hs +++ b/Command/Init.hs @@ -10,6 +10,7 @@ module Command.Init where import Control.Monad.State (liftIO) import Control.Monad (when) import System.Directory +import System.FilePath import Command import qualified Annex @@ -75,7 +76,7 @@ gitAttributesWrite repo = do attributes] attrLine :: String -attrLine = stateLoc ++ "*.log merge=union" +attrLine = stateDir </> "*.log merge=union" {- set up a git pre-commit hook, if one is not already present -} gitPreCommitHookWrite :: Git.Repo -> Annex () |