aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2020-08-29 21:42:59 +0000
committerGlen Barber <gjb@FreeBSD.org>2020-08-29 21:42:59 +0000
commit0fda149dad50a72dd0b4cc974c0e0c1014c7adb8 (patch)
tree3e8777e774906b1b401e10771b7348944b607269
parented19b7c5259d293e42ca4fc7c9eaa29cfcdcfbf3 (diff)
downloadsrc-0fda149dad50a72dd0b4cc974c0e0c1014c7adb8.tar.gz
src-0fda149dad50a72dd0b4cc974c0e0c1014c7adb8.zip
Remove the VCSUPDATE command, because git is too stupid to have
the '-C <directory>' after the subcommand. Meanwhile, hard-code 'git -C <...> pull' for now. Reported by: Michael Butler Sponsored by: Rubicon Communications, LLC (netgate.com)
Notes
Notes: svn path=/head/; revision=364966
-rwxr-xr-xrelease/release.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/release/release.sh b/release/release.sh
index f6632880b3df..292ba16a36e1 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -70,7 +70,6 @@ env_setup() {
exit 1
fi
VCSCMD="/usr/local/bin/git clone -q"
- VCSUPDATE="/usr/local/bin/git pull -q"
# The default git checkout server, and branches for src/, doc/,
# and ports/.
@@ -222,21 +221,21 @@ chroot_setup() {
if [ -z "${SRC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/src/.git" ]; then
- ${VCSUPDATE} -C ${CHROOTDIR}/usr/src
+ git -C ${CHROOTDIR}/usr/src pull
else
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
fi
fi
if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
- ${VCSUPDATE} -C ${CHROOTDIR}/usr/doc
+ git -C ${CHROOTDIR}/usr/doc pull
else
${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
- ${VCSUPDATE} -C ${CHROOTDIR}/usr/ports
+ git -C ${CHROOTDIR}/usr/ports pull
else
${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
fi