From owner-freebsd-git@freebsd.org Thu Mar 4 20:39:10 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 6A1F75595C7; Thu, 4 Mar 2021 20:39:10 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ds2ld5ykkz4t4l; Thu, 4 Mar 2021 20:39:09 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 124Kd3fU054181 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 4 Mar 2021 21:39:05 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Thu, 4 Mar 2021 21:39:03 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Michael Grimm Cc: freebsd-git@freebsd.org, freebsd-questions@freebsd.org Subject: Re: ports and git, first steps Message-ID: Mail-Followup-To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= , Michael Grimm , freebsd-git@freebsd.org, freebsd-questions@freebsd.org References: <6996AB6C-B178-48C2-94D4-1F7D62E59998@ellael.org> <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <003857DB-447A-49E5-8A70-064AD27EB791@ellael.org> User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4Ds2ld5ykkz4t4l X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] 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 20:39:10 -0000 On Thu, 2021-03-04 at 14:46:13 +0100, Michael Grimm wrote: >Ulrich Spörlein wrote: >> On Wed, 2021-03-03 at 16:10:15 +0100, Michael Grimm wrote: > >>> Does anyone know if poudriere is using 'git pull —rebase' as default? >> >> It's just a bunch of shell scripts, so easy to check: >> >> % git grep GIT_CMD >> src/share/poudriere/common.sh:: ${GIT_CMD:=git} >> 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=$(${GIT_CMD} -C ${SRC_BASE} rev-parse --short HEAD) >> src/share/poudriere/ports.sh: ${GIT_CMD} clone --depth=1 --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. Yes and no. It defaults to using the Github mirror and we will force-push the new content there, but `git pull --rebase` will totally barf on that, so you'll need to manually: - git fetch --prune - git checkout -B main origin/main - git branch -D master or something like that. (you need to rebase your stuff from old-master to new-main as well). We could actually bake this logic into poudriere and have it do its thing during a ports update, but it'll be rather fragile I suppose. Cheers Uli