Merge remote-tracking branch 'origin/develop' into develop

2018-05-02 15:39:26 +00:00 · 2018-05-02 15:39:26 +00:00 · 04206ec929
parent fe65065545 183947615f
commit 04206ec929
1 changed files with 1 additions and 1 deletions
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@ -7,7 +7,7 @@ repo="$2"

 curbranch="$TRAVIS_PULL_REQUEST_BRANCH"
 [ -z "$curbranch" ] && curbranch="$TRAVIS_BRANCH"
-[ -z "$curbranch" ] && curbranch="$GIT_BRANCH" # jenkins
+[ -z "$curbranch" ] && curbranch=`"$GIT_BRANCH" | sed -e 's/^origin\///'` # jenkins

 if [ -n "$curbranch" ]
 then