Skip to content
Snippets Groups Projects
Commit 9e80462d authored by Kevin DeMarco's avatar Kevin DeMarco
Browse files

do git fetch instead, remove up-to-date msg for repos

parent a94992d9
No related branches found
No related tags found
No related merge requests found
...@@ -26,8 +26,8 @@ git_sha_compare() ...@@ -26,8 +26,8 @@ git_sha_compare()
echo "${REPO_NAME} ODROID's SHA: ${SHA_ODROID}" echo "${REPO_NAME} ODROID's SHA: ${SHA_ODROID}"
echo "${REPO_NAME} SERVER's SHA: ${SHA_SERVER}" echo "${REPO_NAME} SERVER's SHA: ${SHA_SERVER}"
exit -1 exit -1
else #else
echo "${REPO_NAME} is up-to-date." #echo "${REPO_NAME} is up-to-date."
fi fi
} }
...@@ -79,7 +79,7 @@ if [ ! -e ${IPS_FILE} ]; then ...@@ -79,7 +79,7 @@ if [ ! -e ${IPS_FILE} ]; then
fi fi
pushd ${ACS_ROOT}/acs_ros_ws/src/autonomy-payload >& /dev/null pushd ${ACS_ROOT}/acs_ros_ws/src/autonomy-payload >& /dev/null
git pull origin git fetch origin
git checkout master ./ap_master/launch/master.launch git checkout master ./ap_master/launch/master.launch
git checkout master ./ap_tasks/src/task_runner.py git checkout master ./ap_tasks/src/task_runner.py
if [ ! -f ./ap_master/launch/master.launch ]; then if [ ! -f ./ap_master/launch/master.launch ]; then
......
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