diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-28 14:14:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-28 14:58:48 -0400 |
| commit | a9f8f8336bbb141c238ba9c71d78de00d8d0091e (patch) | |
| tree | 105f4b137c235852885443697c51f5ee71aa6d6e /Annex/AdjustedBranch.hs | |
| parent | bf4c5f82de894139789136457c04dd048956c617 (diff) | |
sync: Added --cleanup, which removes local and remote synced/ branches.
Also deletes any tagged pushes that the assistant might have done,
since those would also prevent resetting a branch back.
This commit was sponsored by andrea rota.
Diffstat (limited to 'Annex/AdjustedBranch.hs')
| -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 52f73e638..9eedf06f5 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -167,7 +167,7 @@ adjustedToOriginal b | adjustedBranchPrefix `isPrefixOf` bs = do let (base, as) = separate (== '(') (drop prefixlen bs) adj <- deserialize (takeWhile (/= ')') as) - Just (adj, Git.Ref.underBase "refs/heads" (Ref base)) + Just (adj, Git.Ref.branchRef (Ref base)) | otherwise = Nothing where bs = fromRef b |