build: always pull master branch for core and plugins...

because that is where we build "-devel" versions from.

build/common.sh

@@ -256,9 +256,17 @@ git_reset()
 	git -C ${1} reset --hard ${REPO_TAG}
 }
 
-git_update()
+git_fetch()
 {
+	echo ">>> Fetching ${DIR}..."
+
 	git -C ${1} fetch --all --prune
+}
+
+git_pull()
+{
+	echo ">>> Pulling branch ${BRANCH} of ${DIR}..."
+
 	git -C ${1} checkout ${2}
 	git -C ${1} pull
 }

build/skim.sh

@@ -46,7 +46,8 @@ done
 )
 
 git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH
-git_update ${PORTSREFDIR} ${PORTSREFBRANCH}
+git_fetch ${PORTSREFDIR}
+git_pull ${PORTSREFDIR} ${PORTSREFBRANCH}
 git_reset ${PORTSDIR} HEAD
 
 UNUSED=1

build/update.sh

@@ -34,23 +34,29 @@ SELF=update
 for ARG in ${@}; do
 	case ${ARG} in
 	core)
-		BRANCH=${COREBRANCH}
+		BRANCHES=${COREBRANCH}
 		DIR=${COREDIR}
+		if [ ${BRANCHES} != master ]; then
+			BRANCHES="master ${BRANCHES}"
+		fi
 		;;
 	plugins)
-		BRANCH=${PLUGINSBRANCH}
+		BRANCHES=${PLUGINSBRANCH}
 		DIR=${PLUGINSDIR}
+		if [ ${BRANCHES} != master ]; then
+			BRANCHES="master ${BRANCHES}"
+		fi
 		;;
 	ports)
-		BRANCH=${PORTSBRANCH}
+		BRANCHES=${PORTSBRANCH}
 		DIR=${PORTSDIR}
 		;;
 	src)
-		BRANCH=${SRCBRANCH}
+		BRANCHES=${SRCBRANCH}
 		DIR=${SRCDIR}
 		;;
 	tools)
-		BRANCH=${TOOLSBRANCH}
+		BRANCHES=${TOOLSBRANCH}
 		DIR=${TOOLSDIR}
 		;;
 	*)
@@ -58,6 +64,8 @@ for ARG in ${@}; do
 		;;
 	esac
 
-	echo ">>> Updating branch ${BRANCH} of ${DIR}..."
-	git_update ${DIR} ${BRANCH}
+	git_fetch ${DIR}
+	for BRANCH in ${BRANCHES}; do
+		git_pull ${DIR} ${BRANCH}
+	done
 done