diff options
| -rw-r--r-- | Annex/AdjustedBranch.hs | 4 | ||||
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index cea138f55..5762c6b30 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -91,8 +91,8 @@ originalBranch = fmap fromAdjustedBranch <$> inRepo Git.Branch.current enterAdjustedBranch :: Adjustment -> Annex () enterAdjustedBranch adj = go =<< originalBranch where - go (Just origbranch) = preventCommits $ do - adjbranch <- adjustBranch adj origbranch + go (Just origbranch) = do + adjbranch <- preventCommits $ adjustBranch adj origbranch inRepo $ Git.Command.run [ Param "checkout" , Param $ fromRef $ Git.Ref.base $ adjbranch diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index f98bff00b..9213158f4 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -342,3 +342,12 @@ like this, at its most simple: -- Generate a version of the commit made on the filter branch -- with the filtering of modified files reversed. unfilteredCommit :: Filter -> Git.Commit -> Git.Commit + +## TODOs + +* Need a better command-line interface than `git annex adjust`, + that allows picking adjustments. +* Interface in webapp to enable adjustments. +* Entering an adjusted branch can race with commits to the current branch, + and so the assistant should not be running, or at least should have + commits disabled when entering it. |