From 029c14b30aff2b2bf8cf86e07c92f95d4d9d7fee Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 25 Jun 2012 13:41:48 +0200
Subject: [PATCH] MINOR Phing checkout bug when branch doesn't exist

Solved by using --force instead, which hard resets to the tracking origin
---
 build.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 9eca5ea..fd1c629 100644
--- a/build.xml
+++ b/build.xml
@@ -421,8 +421,7 @@ Your friendly automated release script.
 
 		<exec command="git checkout master" dir="${module}" checkreturn="true" />
 		<exec command="git fetch origin" dir="${module}" checkreturn="true" />
-		<exec command="git branch -D translation-staging" dir="${module}" checkreturn="true" />
-		<exec command="git branch --track translation-staging origin/translation-staging" dir="${module}" checkreturn="true" />
+		<exec command="git branch --force --track translation-staging origin/translation-staging" dir="${module}" checkreturn="true" />
 		<exec command="git checkout translation-staging" dir="${module}" checkreturn="true" />
 	</target>