diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-29 13:31:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-29 13:31:29 -0400 |
| commit | 74c1d2ec3e6693adf1b2233f984059da02400feb (patch) | |
| tree | 3ceeb16469d7382e3cb5cf499d89387a244fc401 /Annex | |
| parent | 4011e8374f0f5af201c8444894481407ddcd57a8 (diff) | |
use --force in taggedPush
This should make the assistant force update its tagged push branch
after a transition like git annex forget.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/TaggedPush.hs | 4 |
1 files changed, 4 insertions, 0 deletions
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 |