8000 only git pull after doing the enterprise checkout if we're on a branch. · rowhit/arangodb@e7be3e5 · GitHub
[go: up one dir, main page]
8000
Skip to content

Commit e7be3e5

Browse files
dothebartdothebart
committed
only git pull after doing the enterprise checkout if we're on a branch.
1 parent 9238463 commit e7be3e5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

‎Installation/Jenkins/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@ if test -n "${ENTERPRISE_GIT_URL}" ; then
514514
GITARGS=devel
515515
fi
516516
echo "I'm on Branch: ${GITARGS}"
517+
FINAL_PULL="git pull"
517518
fi
518519
# clean up if we're commanded to:
519520
if test -d enterprise -a ${CLEAN_IT} -eq 1; then
@@ -522,7 +523,7 @@ if test -n "${ENTERPRISE_GIT_URL}" ; then
522523
if test ! -d enterprise; then
523524
git clone ${ENTERPRISE_GIT_URL} enterprise
524525
fi
525-
(cd enterprise; git checkout master; git fetch --tags; git pull --all; git checkout ${GITARGS}; git pull )
526+
(cd enterprise; git checkout master; git fetch --tags; git pull --all; git checkout ${GITARGS}; ${FINAL_PULL} )
526527
fi
527528

528529

0 commit comments

Comments
 (0)
0