From 9e80462d75fec1c786f218be177587df8475597b Mon Sep 17 00:00:00 2001
From: Kevin DeMarco <kevin.demarco@gtri.gatech.edu>
Date: Mon, 24 Apr 2017 08:15:14 -0700
Subject: [PATCH] do git fetch instead, remove up-to-date msg for repos
---
deploy/multi/multiple-uav-check.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/deploy/multi/multiple-uav-check.sh b/deploy/multi/multiple-uav-check.sh
index cd86efb..fb08898 100755
--- a/deploy/multi/multiple-uav-check.sh
+++ b/deploy/multi/multiple-uav-check.sh
@@ -26,8 +26,8 @@ git_sha_compare()
echo "${REPO_NAME} ODROID's SHA: ${SHA_ODROID}"
echo "${REPO_NAME} SERVER's SHA: ${SHA_SERVER}"
exit -1
- else
- echo "${REPO_NAME} is up-to-date."
+ #else
+ #echo "${REPO_NAME} is up-to-date."
fi
}
@@ -79,7 +79,7 @@ if [ ! -e ${IPS_FILE} ]; then
fi
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_tasks/src/task_runner.py
if [ ! -f ./ap_master/launch/master.launch ]; then
--
GitLab