diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-05-23 11:23:30 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-05-23 11:23:30 -0400 |
| commit | 81d9661e081a7ca11f4bf5547ffe180071fd81ef (patch) | |
| tree | a26b088710ca161d686e7c9d44bbc9c3574f4aa2 /Annex | |
| parent | 6b5d235b83f9d31fb633354ba12d7d5ff4dcb9c2 (diff) | |
fix recent test suite reversion
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.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index a61df7d62..4c127f97a 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -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" |