diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/AdjustedBranch.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index ae5ad9a51..4caf637c7 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -159,14 +159,14 @@ originalToAdjusted :: OrigBranch -> Adjustment -> AdjBranch originalToAdjusted orig adj = AdjBranch $ Ref $ adjustedBranchPrefix ++ base ++ '(' : serialize adj ++ ")" where - base = fromRef (Git.Ref.basename orig) + base = fromRef (Git.Ref.base orig) adjustedToOriginal :: Branch -> Maybe (Adjustment, OrigBranch) adjustedToOriginal b | adjustedBranchPrefix `isPrefixOf` bs = do let (base, as) = separate (== '(') (drop prefixlen bs) adj <- deserialize (takeWhile (/= ')') as) - Just (adj, Git.Ref.under "refs/heads" (Ref base)) + Just (adj, Git.Ref.underBase "refs/heads" (Ref base)) | otherwise = Nothing where bs = fromRef b |