avoid withWorkTreeRelated affecting annex symlink calculation
This commit is contained in:
parent
f41045bf19
commit
251405eca2
5 changed files with 13 additions and 9 deletions
|
@ -45,11 +45,13 @@ withWorkTreeRelated :: FilePath -> Annex a -> Annex a
|
|||
withWorkTreeRelated d = withAltRepo modrepo unmodrepo
|
||||
where
|
||||
modrepo g = do
|
||||
let g' = g { location = modlocation (location g) }
|
||||
addGitEnv g' "GIT_COMMON_DIR" =<< absPath (localGitDir g)
|
||||
unmodrepo g g' = g' { gitEnv = gitEnv g, location = location g }
|
||||
modlocation l@(Local {}) = l { gitdir = d }
|
||||
modlocation _ = error "withWorkTreeRelated of non-local git repo"
|
||||
g' <- addGitEnv g "GIT_COMMON_DIR" =<< absPath (localGitDir g)
|
||||
g'' <- addGitEnv g' "GIT_DIR" d
|
||||
return (g'' { gitEnvOverridesGitDir = True })
|
||||
unmodrepo g g' = g'
|
||||
{ gitEnv = gitEnv g
|
||||
, gitEnvOverridesGitDir = gitEnvOverridesGitDir g
|
||||
}
|
||||
|
||||
withAltRepo
|
||||
:: (Repo -> IO Repo)
|
||||
|
|
|
@ -17,9 +17,11 @@ import qualified Utility.CoProcess as CoProcess
|
|||
{- Constructs a git command line operating on the specified repo. -}
|
||||
gitCommandLine :: [CommandParam] -> Repo -> [CommandParam]
|
||||
gitCommandLine params r@(Repo { location = l@(Local { } ) }) =
|
||||
setdir : settree ++ gitGlobalOpts r ++ params
|
||||
setdir ++ settree ++ gitGlobalOpts r ++ params
|
||||
where
|
||||
setdir = Param $ "--git-dir=" ++ gitdir l
|
||||
setdir
|
||||
| gitEnvOverridesGitDir r = []
|
||||
| otherwise = [Param $ "--git-dir=" ++ gitdir l]
|
||||
settree = case worktree l of
|
||||
Nothing -> []
|
||||
Just t -> [Param $ "--work-tree=" ++ t]
|
||||
|
|
|
@ -236,6 +236,7 @@ newFrom l = Repo
|
|||
, remotes = []
|
||||
, remoteName = Nothing
|
||||
, gitEnv = Nothing
|
||||
, gitEnvOverridesGitDir = False
|
||||
, gitGlobalOpts = []
|
||||
}
|
||||
|
||||
|
|
|
@ -39,6 +39,7 @@ data Repo = Repo
|
|||
, remoteName :: Maybe RemoteName
|
||||
-- alternate environment to use when running git commands
|
||||
, gitEnv :: Maybe [(String, String)]
|
||||
, gitEnvOverridesGitDir :: Bool
|
||||
-- global options to pass to git when running git commands
|
||||
, gitGlobalOpts :: [CommandParam]
|
||||
} deriving (Show, Eq, Ord)
|
||||
|
|
|
@ -286,5 +286,3 @@ into adjusted view worktrees.]
|
|||
have already been handled by updateAdjustedBranch. But, if another remote
|
||||
pushed a new master at just the right time, the adjusted branch could be
|
||||
rebased on top of a master that it doesn't incorporate, which is wrong.
|
||||
* Annex symlinks generated in merging into an adjusted branch are badly
|
||||
formed to point to the temp git dir's annex object dir.
|
||||
|
|
Loading…
Reference in a new issue