8d9c2afd89
Two fixes. First, and most importantly, relax the isLinkToAnnex check to only look for /annex/objects/, not [^|/].git/annex/objects. If GIT_DIR is used with a detached work tree, the git directory is not necessarily named .git. There are important caveats with doing that at all, since git-annex will make symlinks that point at GIT_DIR, which means that the relative path between GIT_DIR and GIT_WORK_TREE needs to remain stable across all clones of the repository. ---- The other fix is just fixing crazy and wrong code that, when GIT_DIR is set, expects to still find a git repository in the path below the work tree, and uses some of its configuration, and some of GIT_DIR. What was I thinking, and why can't I seem to get this code right?
61 lines
1.7 KiB
Haskell
61 lines
1.7 KiB
Haskell
{- The current git repository.
|
|
-
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Git.CurrentRepo where
|
|
|
|
import System.Posix.Directory (changeWorkingDirectory)
|
|
import System.Posix.Env (getEnv, unsetEnv)
|
|
|
|
import Common
|
|
import Git.Types
|
|
import Git.Construct
|
|
import qualified Git.Config
|
|
|
|
{- Gets the current git repository.
|
|
-
|
|
- Honors GIT_DIR and GIT_WORK_TREE.
|
|
- Both environment variables are unset, to avoid confusing other git
|
|
- commands that also look at them. Instead, the Git module passes
|
|
- --work-tree and --git-dir to git commands it runs.
|
|
-
|
|
- When GIT_WORK_TREE or core.worktree are set, changes the working
|
|
- directory if necessary to ensure it is within the repository's work
|
|
- tree. While not needed for git commands, this is useful for anything
|
|
- else that looks for files in the worktree.
|
|
-}
|
|
get :: IO Repo
|
|
get = do
|
|
gd <- pathenv "GIT_DIR"
|
|
r <- configure gd =<< fromCwd
|
|
wt <- maybe (worktree $ location r) Just <$> pathenv "GIT_WORK_TREE"
|
|
case wt of
|
|
Nothing -> return r
|
|
Just d -> do
|
|
cwd <- getCurrentDirectory
|
|
unless (d `dirContains` cwd) $
|
|
changeWorkingDirectory d
|
|
return $ addworktree wt r
|
|
where
|
|
pathenv s = do
|
|
v <- getEnv s
|
|
case v of
|
|
Just d -> do
|
|
unsetEnv s
|
|
Just <$> absPath d
|
|
Nothing -> return Nothing
|
|
|
|
configure Nothing (Just r) = Git.Config.read r
|
|
configure (Just d) _ = do
|
|
absd <- absPath d
|
|
cwd <- getCurrentDirectory
|
|
r <- newFrom $ Local { gitdir = absd, worktree = Just cwd }
|
|
Git.Config.read r
|
|
configure Nothing Nothing = error "Not in a git repository."
|
|
|
|
addworktree w r = changelocation r $
|
|
Local { gitdir = gitdir (location r), worktree = w }
|
|
changelocation r l = r { location = l }
|