summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 11:23:30 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-23 11:23:30 -0400
commit81d9661e081a7ca11f4bf5547ffe180071fd81ef (patch)
treea26b088710ca161d686e7c9d44bbc9c3574f4aa2
parent6b5d235b83f9d31fb633354ba12d7d5ff4dcb9c2 (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.
-rw-r--r--Annex/AdjustedBranch.hs2
-rw-r--r--Test.hs10
2 files changed, 7 insertions, 5 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"
diff --git a/Test.hs b/Test.hs
index 6cddc7738..f98b8c510 100644
--- a/Test.hs
+++ b/Test.hs
@@ -1062,10 +1062,12 @@ test_conflict_resolution_adjusted_branch = whenM Annex.AdjustedBranch.isGitVersi
writeFile conflictor "conflictor2"
add_annex conflictor @? "add conflicter failed"
git_annex "sync" [] @? "sync failed in r2"
- unlessM (annexeval Config.isDirect) $ do
- -- need v6 to use adjust
- git_annex "upgrade" [] @? "upgrade failed"
- git_annex "adjust" ["--unlock"] @? "adjust failed"
+ -- need v6 to use adjust
+ git_annex "upgrade" [] @? "upgrade failed"
+ -- We might be in an adjusted branch
+ -- already, when eg on a crippled
+ -- filesystem. So, --force it.
+ git_annex "adjust" ["--unlock", "--force"] @? "adjust failed"
pair r1 r2
forM_ [r1,r2,r1] $ \r -> indir r $
git_annex "sync" [] @? "sync failed"