diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:23:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:23:08 -0400 |
| commit | 0fbaf6062e95885daf0da056c2a77d9e20154d41 (patch) | |
| tree | 1d1d1b85bc5960e383a9705b9a25b65c8a99b48b /Annex/AdjustedBranch.hs | |
| parent | 03e0498964647559f5eeece6750c8a2999860ae0 (diff) | |
make sync aware of adjusted branches
So, it will pull and push the original branch, not the adjusted one.
And, for merging, it will use updateAdjustedBranch (not implemented yet).
Note that remaining uses of Git.Branch.current need to be checked too;
for things that should act on the original branch, and not the adjusted
branch.
Diffstat (limited to 'Annex/AdjustedBranch.hs')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 4c009c9ea..1579a1f2f 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -67,9 +67,6 @@ adjustedToOriginal b bs = fromRef b prefixlen = length adjustedBranchPrefix -getAdjustment :: Annex (Maybe (Adjustment, OrigBranch)) -getAdjustment = maybe Nothing adjustedToOriginal <$> inRepo Git.Branch.current - originalBranch :: Annex (Maybe OrigBranch) originalBranch = fmap getorig <$> inRepo Git.Branch.current where @@ -123,6 +120,6 @@ commitAdjustedTree treesha parent = go =<< catCommit parent {- Update the currently checked out adjusted branch, merging the provided - branch into it. -} -updateAdjustedBranch :: Adjustment -> OrigBranch -> Branch -> Annex () +updateAdjustedBranch :: Adjustment -> OrigBranch -> Branch -> Annex Bool updateAdjustedBranch mergebranch = do error "updateAdjustedBranch" |