fix(master_release): Fix default branch to pull from, fetch evyerhing.

This commit is contained in:
Michael Marineau 2013-07-26 21:24:39 -04:00
parent 5375057c86
commit 27af72359e

View File

@ -8,7 +8,7 @@ SCRIPT_ROOT=$(dirname $(readlink -f "$0"))
. "${SCRIPT_ROOT}/common.sh" || exit 1 . "${SCRIPT_ROOT}/common.sh" || exit 1
DEFINE_string master "master" "Manifest master branch to update." DEFINE_string master "master" "Manifest master branch to update."
DEFINE_string branch "build-${TODAYS_VERSION}" \ DEFINE_string branch "origin/build-${TODAYS_VERSION}" \
"Manifest branch, tag, or other ref to get version from." "Manifest branch, tag, or other ref to get version from."
DEFINE_boolean push ${FLAGS_FALSE} "Push to public manifest repository." DEFINE_boolean push ${FLAGS_FALSE} "Push to public manifest repository."
DEFINE_string remote "origin" "Remote name or URL to push to." DEFINE_string remote "origin" "Remote name or URL to push to."
@ -23,6 +23,7 @@ repo init -b "${FLAGS_master}"
info "Updating version.txt from ${FLAGS_branch}" info "Updating version.txt from ${FLAGS_branch}"
cd "${GCLIENT_ROOT}/.repo/manifests" cd "${GCLIENT_ROOT}/.repo/manifests"
git fetch --all
git checkout "${FLAGS_branch}" version.txt git checkout "${FLAGS_branch}" version.txt
git add version.txt git add version.txt
git commit -m "bump(version): Update version from ${FLAGS_branch}" git commit -m "bump(version): Update version from ${FLAGS_branch}"