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

pass --version to init when needed

Browse source
This commit is contained in:
Joey Hess 2015-12-16 13:14:18 -04:00
parent 029111b89a
commit 1e016611de
Failed to extract signature
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Test.hs
View file

@ -243,7 +243,10 @@ unitTests note = testGroup ("Unit Tests " ++ note)
-- this test case create the main repo -- this test case create the main repo
test_init :: Assertion test_init :: Assertion
test_init = innewrepo $ do test_init = innewrepo $ do
git_annex "init" [reponame] @? "init failed" ver <- annexVersion <$> getTestMode
if ver == Annex.Version.defaultVersion
then git_annex "init" [reponame] @? "init failed"
else git_annex "init" [reponame, "--version", ver] @? "init failed"
setupTestMode setupTestMode
where where
reponame = "test repo" reponame = "test repo"
@ -1585,8 +1588,11 @@ clonerepo old new cfg = do
] ]
boolSystem "git" cloneparams @? "git clone failed" boolSystem "git" cloneparams @? "git clone failed"
configrepo new configrepo new
indir new $ indir new $ do
git_annex "init" ["-q", new] @? "git annex init failed" ver <- annexVersion <$> getTestMode
if ver == Annex.Version.defaultVersion
then git_annex "init" ["-q", new] @? "git annex init failed"
else git_annex "init" ["-q", new, "--version", ver] @? "git annex init failed"
unless (bareClone cfg) $ unless (bareClone cfg) $
indir new $ indir new $
setupTestMode setupTestMode
@ -1765,8 +1771,6 @@ getTestMode = Prelude.read <$> Utility.Env.getEnvDefault "TESTMODE" ""
setupTestMode :: IO () setupTestMode :: IO ()
setupTestMode = do setupTestMode = do
testmode <- getTestMode testmode <- getTestMode
annexeval $
Annex.Version.setVersion (annexVersion testmode)
when (forceDirect testmode) $ when (forceDirect testmode) $
git_annex "direct" ["-q"] @? "git annex direct failed" git_annex "direct" ["-q"] @? "git annex direct failed"