Skip to content
Snippets Groups Projects
Commit 56b568b5 authored by Alfonso Tierno's avatar Alfonso Tierno Committed by Gerrit Code Review
Browse files

Merge "The script pulls all branches and now can check out a specific branch or commit-id"

parents 0b6e5398 5dadd5d1
No related branches found
No related tags found
No related merge requests found
...@@ -27,26 +27,32 @@ export OSM_MDG=RO ...@@ -27,26 +27,32 @@ export OSM_MDG=RO
OSM_load_config OSM_load_config
# Here is an example for how to handle an incremental build # Updates all the branches in the local repo (clones if it does not exist)
if [ -d $OSM_MDG ]; then if [ -d $OSM_MDG ]; then
INFO "reusing existing workspace" INFO "reusing existing workspace"
cd $OSM_MDG cd $OSM_MDG
git checkout master #to make sure that we are in the right branch before pulling the code git pull --all
git pull #git checkout master #to make sure that we are in the right branch before pulling the code
# TO DO: probably it makes sense to fetch all branches, but this requires creating the branches locally #git pull
else else
INFO "cloning MDG $OSM_MDG from $OSM_GIT_URL/$OSM_MDG" INFO "cloning MDG $OSM_MDG from $OSM_GIT_URL/$OSM_MDG"
git clone $OSM_GIT_URL/$OSM_MDG git clone $OSM_GIT_URL/$OSM_MDG
cd $OSM_MDG cd $OSM_MDG
for remote in `git branch -r`; do git branch --track ${remote#origin/} $remote; done
fi fi
if [ $# -gt 0 ]; then if [ $# -gt 0 ]; then
if [ "$1" = "checkout" ]; then
INFO "Code to compile: '$2'"
git checkout $2
else
INFO "Code to compile: gerrit refspec '$1', commit-id: '$2'" INFO "Code to compile: gerrit refspec '$1', commit-id: '$2'"
git fetch origin $1 || FATAL "git fetch origin '$1' didn't work" git fetch origin $1 || FATAL "git fetch origin '$1' didn't work"
git checkout -f $2 || FATAL "git checkout -f '$2' didn't work" git checkout -f $2 || FATAL "git checkout -f '$2' didn't work"
fi
else else
INFO "Code to compile: master" INFO "Code to compile: master"
git checkout master git checkout master
fi fi
INFO "starting build" INFO "starting build"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment