From owner-freebsd-git@freebsd.org Wed Nov 18 22:31:00 2020 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 330C64739DD for ; Wed, 18 Nov 2020 22:31:00 +0000 (UTC) (envelope-from dan@langille.org) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CbyFZ6hS9z4lfk for ; Wed, 18 Nov 2020 22:30:58 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id EB82C5C003F for ; Wed, 18 Nov 2020 17:30:57 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 18 Nov 2020 17:30:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= from:content-type:content-transfer-encoding:mime-version:subject :message-id:date:to; s=fm2; bh=PHJJn9Jf2kYW1gO0GJ/nuQa7uqH1Hm8JG pNeMfrddn0=; b=XzyDJ9Cv9iV3gvRJwa8+AwrNhZqVpOgKwBxlcDL46wbJWLjNi ZokfuK38ax1i8Ci+pPXyEuC7t5LErI71lkKSF4A5/anPGCNUvPuRC5CtK3dOTXHQ U33fBYi/XkGLd6v0iThpPEDsB17KursiIQkKW9CtwOs8olvhrBZqp1g5mglSrH0G 0225JpXIjla3pLqlcGLVXQCNlx/6HbGjOqfm2zHzumB8IZCX4gTt+A3Cl03CHt69 +3EvyYXxj41k9zerLyoBBWT6gbNAxUpkjhaPKeZuY/2RDb4nn8abzgnzraSVBDNu N4fPdLRIdJ5aTdDW+5/mYn0aa5UkjbgpGnzHg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=PHJJn9 Jf2kYW1gO0GJ/nuQa7uqH1Hm8JGpNeMfrddn0=; b=YqCeEKiUj+zXZLlv20tvfk Iduaen9qnYBoYSJIcZoNmFpbfeioKm2V+vNALU9B8w0PpCAdYMWjdhTyESnQB2OT 5+tmGaAKfrlsZ92sjEUoFvgGy46VHmRJHeoqAISptpFyDOaFdNtnRSixbxBXq8u5 xGIieooMyrJZb8MnU2yipfqgXJNzE4zOCQBrju1Ns0bHS+pcC1DBk73G0QLgN9yd 460YN1Jc0DY1uxFpcMJVdg8tMuyIuI/6Z/FN0jqIuz1nrEbwqzCLj0PDsFPKpNsg Pg65fp4J+XrZ/RcKrZjEG3L2ge+xcaT9ee682YzxoaDEu5AqVrh+DqwKeIW2DLmA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudefhedgudeifecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephfgtgfgguffkfffvofesthhqmh dthhdtvdenucfhrhhomhepffgrnhcunfgrnhhgihhllhgvuceouggrnheslhgrnhhgihhl lhgvrdhorhhgqeenucggtffrrghtthgvrhhnpefgtdefgeduueduvedtteetkedvvdevvd etheeuvdehgfeljeffheetvddtheegveenucffohhmrghinhepghhithhhuhgsrdgtohhm necukfhppeejvddrjeekrdduledtrdduledtnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomhepuggrnheslhgrnhhgihhllhgvrdhorhhg X-ME-Proxy: Received: from [10.222.78.31] (pool-72-78-190-190.phlapa.fios.verizon.net [72.78.190.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 7FBE7328005D for ; Wed, 18 Nov 2020 17:30:57 -0500 (EST) From: Dan Langille Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: checking out a commits on port quarterly branch Message-Id: <5E8AEDD5-327A-46A0-A186-EDBC616A9F89@langille.org> Date: Wed, 18 Nov 2020 17:30:56 -0500 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CbyFZ6hS9z4lfk X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=XzyDJ9Cv; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=YqCeEKiU; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.29 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.29:from]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.29]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[72.78.190.190:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.29:from]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[66.111.4.29:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.29:from]; MAILMAN_DEST(0.00)[freebsd-git] 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: Wed, 18 Nov 2020 22:31:00 -0000 When FreshPorts processes a commit, it needs a working copy of the repo = as it was at the time of that commit. I have this working on head. I am trying to figure out how to do that = when the commit is on a branch. To get a copy of the branch, I do: $ git checkout branches/2020Q4 $ git branch branches/2020Q2 branches/2020Q3 * branches/2020Q4 master Next, I want the tree as it existed at commit = 46433baae934d92698422495b72f811839caa1a9 i.e. = https://github.com/freebsd/freebsd-ports/commit/46433baae934d92698422495b7= 2f811839caa1a9 My first attempt is $ git checkout 46433baae934d92698422495b72f811839caa1a9 Note: switching to '46433baae934d92698422495b72f811839caa1a9'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in = this state without impacting any branches by switching back to a branch. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -c with the switch command. Example: git switch -c Or undo this operation with: git switch - Turn off this advice by setting config variable advice.detachedHead to = false HEAD is now at 46433baae934 MFH: r555565 That "MFH: r555565' message indicates that I am at the right commit. Is this a concern? $ git branch * (HEAD detached at 46433baae934) branches/2020Q2 branches/2020Q3 branches/2020Q4 master Am I doing this right? Thank you --=20 Dan Langille - BSDCan / PGCon dan@langille.org