Date: Thu, 4 Mar 2021 14:46:13 +0100 From: Michael Grimm <trashcan@ellael.org> To: freebsd-git@freebsd.org, freebsd-questions@freebsd.org Subject: Re: ports and git, first steps Message-ID: <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> In-Reply-To: <YEDO2xpsjz6gMG7C@acme.spoerlein.net> References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> <YD6XP9uqNwa9L5y%2B@acme.spoerlein.net> <B98FC9B8-216F-48CF-9FCC-18E780E13CDE@ellael.org> <YEDO2xpsjz6gMG7C@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Ulrich Sp=C3=B6rlein <uqs@FreeBSD.org> wrote:
> On Wed, 2021-03-03 at 16:10:15 +0100, Michael Grimm wrote:
>> Does anyone know if poudriere is using 'git pull =E2=80=94rebase' as =
default?
>=20
> It's just a bunch of shell scripts, so easy to check:
>=20
> % git grep GIT_CMD
> src/share/poudriere/common.sh:: ${GIT_CMD:=3Dgit}
> src/share/poudriere/jail.sh: ${GIT_CMD} clone =
${GIT_DEPTH} -q -b ${VERSION} ${GIT_FULLURL} ${SRC_BASE} || err 1 " =
fail"
> src/share/poudriere/jail.sh: ${GIT_CMD} -C =
${SRC_BASE} pull --rebase -q || err 1 " fail"
> src/share/poudriere/jail.sh: ${GIT_CMD} =
checkout -q "${TORELEASE}" || err 1 " fail"
> src/share/poudriere/jail.sh: git_sha=3D$(${GIT_CMD} -C =
${SRC_BASE} rev-parse --short HEAD)
> src/share/poudriere/ports.sh: ${GIT_CMD} clone =
--depth=3D1 --single-branch ${quiet} -b ${BRANCH} ${GIT_FULLURL} =
${PTMNT} || err 1 " fail"
> src/share/poudriere/ports.sh: ${GIT_CMD} -C =
${PORTSMNT:-${PTMNT}} pull --rebase ${quiet}
Sorry for the noise, I should have find out by myself :-(
> Besides, `git pull --rebase` is pretty much the only sane choice for =
poudriere anyway.
Good to know. Now, all I need to modify is the git repository's server =
name after the final migration.
Thanks and regards,
Michael=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?003857DB-447A-49E5-8A70-064AD27EB791>