diff options
Diffstat (limited to 'Annex/TaggedPush.hs')
| -rw-r--r-- | Annex/TaggedPush.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Annex/TaggedPush.hs b/Annex/TaggedPush.hs index 5dac345f2..039dc0e17 100644 --- a/Annex/TaggedPush.hs +++ b/Annex/TaggedPush.hs @@ -13,13 +13,14 @@ import qualified Annex.Branch import qualified Git import qualified Git.Ref import qualified Git.Command +import qualified Git.Branch import Utility.Base64 {- Converts a git branch into a branch that is tagged with a UUID, typically - the UUID of the repo that will be pushing it, and possibly with other - information. - - - Pushing to branches on the remote that have out uuid in them is ugly, + - Pushing to branches on the remote that have our uuid in them is ugly, - but it reserves those branches for pushing by us, and so our pushes will - never conflict with other pushes. - @@ -50,7 +51,10 @@ taggedPush :: UUID -> Maybe String -> Git.Ref -> Remote -> Git.Repo -> IO Bool taggedPush u info branch remote = Git.Command.runBool [ Param "push" , Param $ Remote.name remote - , Param $ refspec Annex.Branch.name + {- Using forcePush here is safe because we "own" the tagged branch + - we're pushing; it has no other writers. Ensures it is pushed + - even if it has been rewritten by a transition. -} + , Param $ Git.Branch.forcePush $ refspec Annex.Branch.name , Param $ refspec branch ] where |