diff options
author | 2015-12-24 19:23:18 -0400 | |
---|---|---|
committer | 2015-12-24 19:23:18 -0400 | |
commit | 819389465d4caedd10e905f0945c60e3fc67c8ea (patch) | |
tree | 7c722fbf22d2461fd38fe1986d157de322c17922 /Git.hs | |
parent | 378417c70338418ce2fd42643cad5b2f31d7ed8e (diff) | |
parent | a9b36eb958b2dec1cefefe92262965b0f7dceb27 (diff) |
Merge branch 'smudge'
Diffstat (limited to 'Git.hs')
-rw-r--r-- | Git.hs | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -28,6 +28,7 @@ module Git ( repoPath, localGitDir, attributes, + attributesLocal, hookPath, assertLocal, adjustPath, @@ -125,8 +126,11 @@ assertLocal repo action {- Path to a repository's gitattributes file. -} attributes :: Repo -> FilePath attributes repo - | repoIsLocalBare repo = repoPath repo ++ "/info/.gitattributes" - | otherwise = repoPath repo ++ "/.gitattributes" + | repoIsLocalBare repo = attributesLocal repo + | otherwise = repoPath repo </> ".gitattributes" + +attributesLocal :: Repo -> FilePath +attributesLocal repo = localGitDir repo </> "info" </> "attributes" {- Path to a given hook script in a repository, only if the hook exists - and is executable. -} |