From 60f9fc3edec5e10a54c2056aba757fcc51ac0210 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 8 Jun 2017 10:58:38 +0200 Subject: Fix git checkout and be less verbose MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7d2b374f1ee0fe0d96c984c3e757f2fd49dd6a22 Signed-off-by: Jan-Simon Möller --- jjb/common/include-apps-build-app.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'jjb/common/include-apps-build-app.sh') diff --git a/jjb/common/include-apps-build-app.sh b/jjb/common/include-apps-build-app.sh index 01d765d0..8940ac00 100644 --- a/jjb/common/include-apps-build-app.sh +++ b/jjb/common/include-apps-build-app.sh @@ -40,7 +40,7 @@ HANDLED="no" # Projects in apps/* ################### -if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "^apps/"); then +if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "apps/"); then MYPROJECT=`echo $TARGETPROJECT | sed -e "s#apps/##g"` @@ -50,7 +50,8 @@ if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "^apps/"); git clone https://${GERRIT_HOST}/gerrit/${GERRIT_PROJECT}.git pushd ${MYPROJECT} git log -1 - git reset --hard ${GERRIT_REFSPEC} + git fetch ${TARGET_REFSPEC} + git reset --hard FETCH_HEAD git log -1 if test -f Makefile ; then make -- cgit 1.2.3-korg