mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Joey Hess 2015-03-30 19:55:35 -04:00
parent 15d45186cc
commit 0a6933771d
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Annex/Fixup.hs
View file

@ -27,12 +27,18 @@ import qualified Data.Map as M
fixupRepo :: Repo -> GitConfig -> IO Repo fixupRepo :: Repo -> GitConfig -> IO Repo
fixupRepo r c = do fixupRepo r c = do
let r' = r { gitGlobalOpts = gitGlobalOpts r ++ [Param "--literal-pathspecs"] } let r' = disableWildcardExpansion r
r'' <- fixupSubmodule r' c r'' <- fixupSubmodule r' c
if annexDirect c if annexDirect c
then fixupDirect r'' then fixupDirect r''
else return r'' else return r''
{- Disable git's built-in wildcard expansion, which is not wanted
- when using it as plumbing by git-annex. -}
disableWildcardExpansion :: Repo -> Repo
disableWildcardExpansion r = r
{ gitGlobalOpts = gitGlobalOpts r ++ [Param "--literal-pathspecs"] }
{- Direct mode repos have core.bare=true, but are not really bare. {- Direct mode repos have core.bare=true, but are not really bare.
- Fix up the Repo to be a non-bare repo, and arrange for git commands - Fix up the Repo to be a non-bare repo, and arrange for git commands
- run by git-annex to be passed parameters that override this setting. -} - run by git-annex to be passed parameters that override this setting. -}