From c6cc0eda5ee5d886d0d66548b12fc988daf1b06f Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 18 Apr 2016 20:12:10 +0200 Subject: [PATCH] Again jratecalc (Cho-Time GmbH -specific project) needs to be separted out from "Open Source" projects. Signed-off-by: Roland Haeder --- pull-stick.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pull-stick.sh b/pull-stick.sh index bca9694..3dc73ed 100755 --- a/pull-stick.sh +++ b/pull-stick.sh @@ -6,7 +6,7 @@ for project in ${LIST}; do if [ ! -d "${JPROJECTS_HOME}/${project}" ] then echo "$0: Project '${project}' does not exist." - continue; + continue fi cd "${JPROJECTS_HOME}/${project}" || exit 255 @@ -17,8 +17,16 @@ for project in ${LIST}; do git checkout -- . fi + SKIP_TEST="${project:0:9}" + echo "$0: Pulling '${project}' ..." - git pull transport master || exit 255 + if [ "${SKIP_TEST}" = "jratecalc" ] + then + git pull --all || exit 255 + else + git pull transport master || exit 255 + fi + echo "$0: Rebasing '${project}' ..." git rebase origin/master || exit 255 done -- 2.30.2