MINOR Phing checkout bug when branch doesn't exist

Solved by using --force instead, which hard resets to the tracking origin
This commit is contained in:
Ingo Schommer 2012-06-25 13:41:48 +02:00
parent 04cf94ff76
commit 029c14b30a
1 changed files with 1 additions and 2 deletions

View File

@ -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>