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

fix recent test suite reversion

Browse source 
git annex adjust --force will overwrite any current adjusted branch.
I didn't document this because for the user, deleting the branch is just as
good.
This commit is contained in:
Joey Hess 2016-05-23 11:23:30 -04:00
parent e394315b67
commit 80b86ff78d
Failed to extract signature
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/AdjustedBranch.hs
View file

@ -191,7 +191,7 @@ enterAdjustedBranch adj = go =<< originalBranch
where
go (Just origbranch) = do
let adjbranch = adjBranch $ originalToAdjusted origbranch adj
ifM (inRepo $ Git.Ref.exists adjbranch)
ifM (inRepo (Git.Ref.exists adjbranch) <&&> (not <$> Annex.getState Annex.force))
( do
mapM_ (warning . unwords)
[ [ "adjusted branch"