Commit 5fda0292 authored by Xavier Perseguers's avatar Xavier Perseguers
Browse files

[BUGFIX] Git repository is not clean after branch switch

Change-Id: Id90795cc925a0410c73b43b5f09fc3af73f2d238
Reviewed-on: http://review.typo3.org/41961

Reviewed-by: Xavier Perseguers's avatarXavier Perseguers <xavier@typo3.org>
Tested-by: Xavier Perseguers's avatarXavier Perseguers <xavier@typo3.org>
parent 7d3ea3b9
......@@ -35,9 +35,9 @@ fi
# Update TYPO3 sources
echo "[INFO] Fetching latest changes from TYPO3 CMS sources"
pushd ${SOURCES} >/dev/null
git fetch >/dev/null 2>&1
git checkout master >/dev/null 2>&1
git reset --hard origin/master >/dev/null 2>&1
git fetch >/dev/null 2>&1
popd >/dev/null
BRANCHES_INDEXES=( ${!TYPO3_BRANCHES[@]} )
......@@ -50,7 +50,7 @@ for VERSION in ${VERSIONS}; do
echo "[INFO] ------------------------------------------------------"
pushd ${SOURCES} >/dev/null
git checkout ${TYPO3_BRANCHES[$VERSION]} >/dev/null 2>&1
git pull >/dev/null 2>&1
git reset --hard origin/${TYPO3_BRANCHES[$VERSION]} >/dev/null 2>&1
popd >/dev/null
GLOBAL_MAPPING=${POOTLE_PO}/.typo3/${VERSION}.filemapping
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment