build(publish.sh): uncomment prepare steps for existing tmp repo

I tested these steps manually and they seem to work well.
This commit is contained in:
Igor Minar 2015-12-15 03:31:47 -08:00
parent 059e09c3be
commit de996ec50b
1 changed files with 5 additions and 10 deletions

View File

@ -29,16 +29,11 @@ function prepare {
if [ -d "$REPO_DIR" ]; then if [ -d "$REPO_DIR" ]; then
# TODO(i): it's not clear how to safely fetch and update a shallow clone cd $REPO_DIR
# I'll need to test this during the next release git fetch --update-shallow origin
echo "-- TODO: Update code.angularjs.org repo at $REPO_DIR" git checkout master
echo "-- TODO: if pushing the 'publish' action fails, rebase the repo manually and push" git merge --ff-only origin/master
echo "-- TODO: or delete $REPO_DIR and rerun the prepare and publish steps" cd -
#cd $REPO_DIR
#git fetch --update-shallow origin
#git checkout master
#git merge --ff-only origin/master
#cd -
else else
echo "-- Cloning code.angularjs.org into $REPO_DIR" echo "-- Cloning code.angularjs.org into $REPO_DIR"
git clone git@github.com:angular/code.angularjs.org.git $REPO_DIR --depth=1 git clone git@github.com:angular/code.angularjs.org.git $REPO_DIR --depth=1