From 74c1d2ec3e6693adf1b2233f984059da02400feb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 29 Aug 2013 13:31:29 -0400
Subject: use --force in taggedPush

This should make the assistant force update its tagged push branch
after a transition like git annex forget.
---
 Annex/TaggedPush.hs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Annex')

diff --git a/Annex/TaggedPush.hs b/Annex/TaggedPush.hs
index 44a1a0eb0..2a5f823fd 100644
--- a/Annex/TaggedPush.hs
+++ b/Annex/TaggedPush.hs
@@ -49,6 +49,10 @@ fromTaggedBranch b = case split "/" $ show b of
 taggedPush :: UUID -> Maybe String -> Git.Ref -> Remote -> Git.Repo -> IO Bool
 taggedPush u info branch remote = Git.Command.runBool
         [ Param "push"
+	-- This 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 "--force"
         , Param $ Remote.name remote
         , Param $ refspec Annex.Branch.name
         , Param $ refspec branch
-- 
cgit v1.2.3