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:
parent
04cf94ff76
commit
029c14b30a
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in New Issue