make gitDir absolute
This commit is contained in:
parent
7cedd28ab0
commit
e97fede8cd
3 changed files with 8 additions and 8 deletions
12
Git.hs
12
Git.hs
|
@ -247,11 +247,11 @@ attributes repo
|
|||
| configBare repo = workTree repo ++ "/info/.gitattributes"
|
||||
| otherwise = workTree repo ++ "/.gitattributes"
|
||||
|
||||
{- Path to a repository's .git directory, relative to its workTree. -}
|
||||
{- Path to a repository's .git directory. -}
|
||||
gitDir :: Repo -> String
|
||||
gitDir repo
|
||||
| configBare repo = ""
|
||||
| otherwise = ".git"
|
||||
| configBare repo = workTree repo
|
||||
| otherwise = workTree repo </> ".git"
|
||||
|
||||
{- Path to a repository's --work-tree, that is, its top.
|
||||
-
|
||||
|
@ -345,10 +345,10 @@ urlAuthPart _ repo = assertUrl repo $ error "internal"
|
|||
|
||||
{- Constructs a git command line operating on the specified repo. -}
|
||||
gitCommandLine :: Repo -> [CommandParam] -> [CommandParam]
|
||||
gitCommandLine repo@(Repo { location = Dir d} ) params =
|
||||
gitCommandLine repo@(Repo { location = Dir _ } ) params =
|
||||
-- force use of specified repo via --git-dir and --work-tree
|
||||
[ Param ("--git-dir=" ++ d ++ "/" ++ gitDir repo)
|
||||
, Param ("--work-tree=" ++ d)
|
||||
[ Param ("--git-dir=" ++ gitDir repo)
|
||||
, Param ("--work-tree=" ++ workTree repo)
|
||||
] ++ params
|
||||
gitCommandLine repo _ = assertLocal repo $ error "internal"
|
||||
|
||||
|
|
2
Init.hs
2
Init.hs
|
@ -79,7 +79,7 @@ unlessBare a = do
|
|||
preCommitHook :: Annex FilePath
|
||||
preCommitHook = do
|
||||
g <- Annex.gitRepo
|
||||
return $ Git.workTree g ++ "/" ++ Git.gitDir g ++ "/hooks/pre-commit"
|
||||
return $ Git.gitDir g ++ "/hooks/pre-commit"
|
||||
|
||||
preCommitScript :: String
|
||||
preCommitScript =
|
||||
|
|
|
@ -20,7 +20,7 @@ usage :: IO a
|
|||
usage = error $ "bad parameters\n\n" ++ header
|
||||
|
||||
tmpIndex :: Git.Repo -> FilePath
|
||||
tmpIndex g = Git.workTree g </> Git.gitDir g </> "index.git-union-merge"
|
||||
tmpIndex g = Git.gitDir g </> "index.git-union-merge"
|
||||
|
||||
setup :: Git.Repo -> IO ()
|
||||
setup g = cleanup g -- idempotency
|
||||
|
|
Loading…
Reference in a new issue