update urls, and simplify branch selection

diff --git a/.bin/cros-repo b/.bin/cros-repo
index b048f6c6621ee91bd53f115bfe9cfbc3c0ed4b4d..c03020b35725f139e0835e183a27ca53e323594d 100755 (executable)
--- a/.bin/cros-repo
+++ b/.bin/cros-repo
@@ -29,11 +29,11 @@ while [[ $# -gt 0 ]] ; do
        case $1 in
        int)
                MANIFEST='ssh://gerrit-int.chromium.org:29419/chromeos/manifest-internal.git'
-               REPO_URL='http://git.chromium.org/external/repo.git'
+               REPO_URL='https://git.chromium.org/git/external/repo.git'
                ;;
        ext)
-               MANIFEST='http://git.chromium.org/chromiumos/manifest.git'
-               REPO_URL='http://git.chromium.org/external/repo.git'
+               MANIFEST='https://git.chromium.org/git/chromiumos/manifest.git'
+               REPO_URL='https://git.chromium.org/git/external/repo.git'
                ;;
        -b)
                BRANCH=$2
@@ -51,6 +51,10 @@ while [[ $# -gt 0 ]] ; do
        shift
 done
 
+if [[ ${#BRANCH} -eq 3 ]] && [[ -d ${REF} ]] ; then
+       BRANCH=$(git --git-dir="${REF}/.repo/manifests.git" branch -a | grep -o "release-${BRANCH}.*")
+fi
+
 v repo init \
        ${MANIFEST:+-u "${MANIFEST}"} \
        ${REPO_URL:+--repo-url="${REPO_URL}"} \