From owner-freebsd-git@freebsd.org Thu Mar 4 13:46:26 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F64554A58D; Thu, 4 Mar 2021 13:46:26 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from mx2.enfer-du-nord.net (mx2.enfer-du-nord.net [IPv6:2001:41d0:401:2100::e48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrsbP4Tq8z3mlL; Thu, 4 Mar 2021 13:46:25 +0000 (UTC) (envelope-from trashcan@ellael.org) Received: from [IPv6:2003:fb:4f00:9901:5d06:454:6d8:6a25] (p200300fb4F0099015D06045406D86a25.dip0.t-ipconnect.de [IPv6:2003:fb:4f00:9901:5d06:454:6d8:6a25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.enfer-du-nord.net (Postfix) with ESMTPSA id 4DrsbD0Vjdz182V; Thu, 4 Mar 2021 14:46:16 +0100 (CET) From: Michael Grimm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: ports and git, first steps Date: Thu, 4 Mar 2021 14:46:13 +0100 References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> To: freebsd-git@freebsd.org, freebsd-questions@freebsd.org In-Reply-To: Message-Id: <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4DrsbP4Tq8z3mlL X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of trashcan@ellael.org has no SPF policy when checking 2001:41d0:401:2100::e48) smtp.mailfrom=trashcan@ellael.org X-Spamd-Result: default: False [-1.60 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:41d0:401:2100::e48:from]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; ARC_NA(0.00)[]; AUTH_NA(1.00)[]; DMARC_NA(0.00)[ellael.org]; SPAMHAUS_ZRD(0.00)[2001:41d0:401:2100::e48:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:16276, ipnet:2001:41d0::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git,freebsd-questions] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 13:46:26 -0000 Ulrich Sp=C3=B6rlein 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=