From owner-freebsd-git@freebsd.org Mon Jan 25 21:10:20 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 0AFF54F1F49 for ; Mon, 25 Jan 2021 21:10:20 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DPjF72BYwz3LyD for ; Mon, 25 Jan 2021 21:10:19 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x333.google.com with SMTP id m2so705090wmm.1 for ; Mon, 25 Jan 2021 13:10:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=iLm/2cRXvP1Z79St22v3p8mdzWOuWR3C+slMKpztutQ=; b=lWfdFL7RmkZo4+llOpAE9QiVpCALoqSLep2LUYL9PDZMKAZnPq4HSpxc3NoNT7xDci DY7Kk0aqUoAwURvkAD/uTgjpd0tlxwOd42LAsSRvrKCxoQuBqhJFVWG8ldaWUE2CFV6I dSLewQMXv+oiagnHachY2Q/fhtisf6EADnfbOFSXSYxqnWKaCAIxTyyk6QqEWsCmkfF4 zi2pOvwfcR8yTx+Ft0hp8uf3PAz8wEz6YhsFPc8SXxlzrYxmyv0iQ68QRXw7R0hIxGJ/ yZcGtMDWoCQ78vNtGhABKU5ScxTTORhCrTqvygDxVyUuc2Sn0HVMqw0R5yTSSvelcMFW kisw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=iLm/2cRXvP1Z79St22v3p8mdzWOuWR3C+slMKpztutQ=; b=Gs6vMz3RwCfk5Xme9JDjmf7v9K/p2hNtlo01t5KPkswW/anvT13MMR0G8ZhCo1et2g G6gHCeVoHXyokGf3/JNt2ZMQlLwQ8cgvCK7aBIugQp7WEWW518DRBL+fIMqwTKwcoKcr HC1GhPRoxBaZ8yQaNIWTnHjvPYX7/l4sLNwtcuuk1Idt89mtBWtjc+WB3IOp5ovV4l2/ YymcFsp42caSyJBcLnkR/2rb5jnNyHRHtOqHO+TwyY8qH7OKPl27wVNSuVRqIWXqI48i 76CfG7D+FqgjVOOJG/kossy+MdRm5xycLdrqsgy77yv2DOHfeOPBQlce1ASy1BkDFDnT pXVg== X-Gm-Message-State: AOAM530RGZRx1LbsQ3B+5x6FoRl+tgRmg54334rbweRcSsUu4vUq7Bly 16yZnq0deRoOuJ1EFrw5ZeNe9xuLjQmi4A== X-Google-Smtp-Source: ABdhPJzGdbzAOl9eI5Ikx7JTUBdGPNJLrpqCspw4eaVX87Y+W7iBhC/ywKBql3n5kmiaNKcVPXHuvg== X-Received: by 2002:a05:600c:3549:: with SMTP id i9mr1826063wmq.47.1611609017083; Mon, 25 Jan 2021 13:10:17 -0800 (PST) Received: from [192.168.1.11] (88-105-96-80.dynamic.dsl.as9105.com. [88.105.96.80]) by smtp.gmail.com with ESMTPSA id g14sm26325364wru.45.2021.01.25.13.10.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 25 Jan 2021 13:10:16 -0800 (PST) To: freebsd-git@freebsd.org From: Graham Perrin Subject: cgit-dev.freebsd.org/ports/ default branch Message-ID: <7eafc8a7-1a74-407f-7f0c-045e4f4721fb@gmail.com> Date: Mon, 25 Jan 2021 21:10:16 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-Rspamd-Queue-Id: 4DPjF72BYwz3LyD X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=lWfdFL7R; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::333 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com X-Spamd-Result: default: False [-3.92 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.92)[-0.922]; RECEIVED_SPAMHAUS_PBL(0.00)[88.105.96.80:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::333:from]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; 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)[2a00:1450:4864:20::333:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::333:from]; RCVD_TLS_ALL(0.00)[]; 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: Mon, 25 Jan 2021 21:10:20 -0000 Hi If not already noted, currently defaults to: branches/2014Q1 – should (I guess) default, instead, to main. From owner-freebsd-git@freebsd.org Tue Jan 26 02:24:59 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 C22974FBBF6 for ; Tue, 26 Jan 2021 02:24:59 +0000 (UTC) (envelope-from tech-lists@zyxst.net) 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 4DPrDC0Xpcz4XRP for ; Tue, 26 Jan 2021 02:24:58 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 3588E5C0176 for ; Mon, 25 Jan 2021 21:24:58 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Mon, 25 Jan 2021 21:24:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zyxst.net; h= date:from:to:subject:message-id:mime-version:content-type; s= fm1; bh=J4axvubdzHeD3qVoVt7fXNuClK6tTF6ty6pD+WeEVrE=; b=jSCI4F+2 MghDA66TASOWPikJ+TWFRaI+Scr0FafsXCrG/zvdmvLWvWAaTk+C3cTXCVBrqQjL Z1hh1Jdbsa/ayy5BOGtq9T5mnOx2c06OgV+JQmvdg9HHynWQyfgdAgPKYmTP6/ex IjMnceJyAf1++mmhg0r5hkI/PvzzshKsgA3h0oXxyqYtc1chXG73thvJQ82AyjMa J+Fi+rB2uV51nHoIAd0Q6iCZRqltTOl5/jijH0Dr+G/+hr0MyIqiBnY+I6mmf2GC T2CRmffLSwO2oOLUO7gPlU0dlCoig4F0BPLLthS8vVozzoiYmwJL2mXidnC0M4EY 7RCWUpqPWjeXdQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=J4axvubdzHeD3qVoVt7fXNuClK6tT F6ty6pD+WeEVrE=; b=Jt7yGZ/ZRXsCZJGWqx1U/WG/cY7g7FPi2dl35w33Qd9Sb d6o+GXcjzOWacPC+9zPOZbtLfyjKD4tqW1usORpcvMBMCKURCZakEVFyX5oezZx6 oCwX39mJipOX468trxlceQQdQ6CFnYInSUtGutAadBCgMSEoPMH2dX/W2b6mpTgv lYO7XnRQof9HBWVgA6Uw+dfHwvt+/qdW4h1doUC2ARMGkR+m9d/hcZppz3UlFB0A z1HKNFuPkWOQnivc37RPm6qzn/S83925IXxudpERHy9pkZq5W2bRNlUSzgcs6P25 R9CZwGrzJO20ZA5sx+mx/Ocs/mdP30Szul6jnLqJQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvdeggdeggecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfggtggusehgtderredttd dvnecuhfhrohhmpehtvggthhdqlhhishhtshcuoehtvggthhdqlhhishhtshesiiihgihs thdrnhgvtheqnecuggftrfgrthhtvghrnhepvefghffftdefkeelleehtdejledvhfdvge eijeevfffguddvhfetgeejueejueeinecukfhppeekvddrjedtrdeluddruddtudenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehtvggthhdqlh hishhtshesiiihgihsthdrnhgvth X-ME-Proxy: Received: from desktop (fws.zyxst.net [82.70.91.101]) by mail.messagingengine.com (Postfix) with ESMTPA id CE996108005C for ; Mon, 25 Jan 2021 21:24:57 -0500 (EST) Date: Tue, 26 Jan 2021 02:24:56 +0000 From: tech-lists To: freebsd-git@freebsd.org Subject: git commands for checking out 13-stable Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LNbGeTloityUceKw" Content-Disposition: inline X-Rspamd-Queue-Id: 4DPrDC0Xpcz4XRP X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zyxst.net header.s=fm1 header.b=jSCI4F+2; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=Jt7yGZ/Z; dmarc=none; spf=pass (mx1.freebsd.org: domain of tech-lists@zyxst.net designates 66.111.4.29 as permitted sender) smtp.mailfrom=tech-lists@zyxst.net X-Spamd-Result: default: False [-5.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.29:from]; 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)[zyxst.net:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.29:from]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.29:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[zyxst.net:s=fm1,messagingengine.com:s=fm1]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[zyxst.net]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[66.111.4.29:from:127.0.2.255]; MID_RHS_NOT_FQDN(0.50)[]; 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: Tue, 26 Jan 2021 02:24:59 -0000 --LNbGeTloityUceKw Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, What are the git commands for: 1. checking out 13/stable from a bare /usr/src 2. keeping this checkout up-to-date 3. same, but for 12/stable At what stage do we have to use etcupdate? rather than mergemaster thanks, --=20 J. --LNbGeTloityUceKw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE8n3tWhxW11Ccvv9/s8o7QhFzNAUFAmAPfWgACgkQs8o7QhFz NAUfxg/+Mq+cL2gxg6T2hMK87TN+bV2ctUpkQOM+eJ3fWz0vVWrSt1dy+Vus9pny 887b6FZzhkZ0Jtlo2bnpTiBmUsnfezFu4ZXHyjTNX9xzi1alE9D1BXMGU/V1n2sV MEPR45A4XICxGg9+UbDflaVY016qyhrAFPejEpMCGOHI+KRFJW2HvrjhwansIhhK CetQlUJDJsDoH5ZjwaznIAG9nBA7+iuKuKTSIrTuK1+KhzMgHmd0QwiWKuXcKlHn FR5a2SMm52XRy7Lv+/JnZeiDU5GIbpW9DE3riLR5Dc7H4EAPkjwV5T0AAnLeY9xw 2vE8HO2oa6XxFRQ+XAlfhWhM/MxUIxuRIOh/w9J1H90eEhQw7Pm4XGbq2lmoUE51 VA0QNZzPVJd7tt0xs7kCgRxR5a1nzicfumJNsXZwEOoeHqzw7JXeMz9CNzk4W4us MmqZjfNU29jhUTvVofd7b4m4ib8Uq5PMxTKrWyvy5J8QqNnZ/JbxC+awwfyCaBLm 2/slq0ySQbNXASLVToz3NnUOeDEWXUQrAR/NYuUokOTZEQdYmRILGbr9iTN0BiNY kOJFudXC3kirbwBCHa2Z5pSt+HbG82h4xMjxa224h+WVsEE0bNxwt6wVgxMPDarv x1MXDEAQ8RAaQ4LO5FdU4R40Uxi/+H2TC1U+eeE/XhDJxW+F//g= =fweA -----END PGP SIGNATURE----- --LNbGeTloityUceKw-- From owner-freebsd-git@freebsd.org Tue Jan 26 02:45:43 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 DD3A94FC688 for ; Tue, 26 Jan 2021 02:45:43 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (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 4DPrh663jhz4ZDP for ; Tue, 26 Jan 2021 02:45:42 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 10Q2jeZP021484; Tue, 26 Jan 2021 02:45:40 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 10Q2je57021483; Mon, 25 Jan 2021 18:45:40 -0800 (PST) (envelope-from david) Date: Mon, 25 Jan 2021 18:45:40 -0800 From: David Wolfskill To: tech-lists Cc: freebsd-git@freebsd.org Subject: Re: git commands for checking out 13-stable Message-ID: Reply-To: freebsd-git@freebsd.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="JiQnolh6Px2hJQlO" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DPrh663jhz4ZDP X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-5.40 / 15.00]; HAS_REPLYTO(0.00)[freebsd-git@freebsd.org]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; DMARC_NA(0.00)[catwhisker.org]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_TLS_LAST(0.00)[]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; RCVD_COUNT_TWO(0.00)[2]; 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: Tue, 26 Jan 2021 02:45:43 -0000 --JiQnolh6Px2hJQlO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 26, 2021 at 02:24:56AM +0000, tech-lists wrote: > Hi, >=20 > What are the git commands for: There are, undoubtedly, many different ways to do at least some of what you ask; making a good choice among them requires more knowledge of your requirements and a deeper understanding of how git works than I have. That said, while I haven't updated https://www.catwhisker.org/~david/FreeBSD/repo-sync.html specifically for stable/13, it's isomorphic to stable/12. More specifically, what I did/do: > 1. checking out 13/stable from a bare /usr/src # Initially: # Access my local mirror of https://git.freebsd.org/src.git. # Could use https://git.freebsd.org/src.git directly. git clone file:///repo/git/freebsd/src.git /usr/src git checkout stable/13 > 2. keeping this checkout up-to-date # Each morning (after my local mirror has been updated): git -C /usr/src pull > 3. same, but for 12/stable The above, but s/13/12/g (Well, mught want to think about where you want that working copy to be. On my machines where I track FreeBSD, I boot them from different slices to run different branches of FreeBSD, so /usr/src is the appropriate working copy for whatever branch I'm running, as each slice has its own root and /usr file systems.) > At what stage do we have to use etcupdate? rather than mergemaster I made the switch after about the 3rd day following the svn->git switch. Had I been a masochist, I could have continued using mergemaster. > thanks, > --=20 > J. Further details at links from the above-cited Web page. Peace, david --=20 David H. Wolfskill david@catwhisker.org Some "Republicans" seem bound and determined to turn the party known for touting "law and order" into one that supports mob rule and insurrection. See https://www.catwhisker.org/~david/publickey.gpg for my public key. --JiQnolh6Px2hJQlO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmAPglRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnSCggAhIFgJl8EXkiB+nndVl/L6q132uz3GtApntS72fElnnrH+Ufjk5SwuIPR 2T+BSMjCduILg+hJpau9np/+rFeOfBCWi8c/Htx0Wkzp95fG/8SlwQaLaKaUvCyF FG0GKQRt+S8lfTIhyFevsUXp9ASRJJ/Aj7ubu6Bj59xV6vgpFWHZUzRN2T/pz959 P4uKZ2XxQW8QSSSun1kki+IFN4F4zMN2La0Fv3847cAxy5JIii29xX/jte4dzLWw +c7yOEBYhihamizXuSU4LBnYQqQzH5MNTTuuDcCiO1PLIvMMHKTVE3h/yTd5q1Tm I7oH9zWe1x0cJJJ4CjL42SK/DRcdjQ== =quMz -----END PGP SIGNATURE----- --JiQnolh6Px2hJQlO-- From owner-freebsd-git@freebsd.org Tue Jan 26 14:10:29 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 6E5664F0794 for ; Tue, 26 Jan 2021 14:10:29 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from mailhost.netlabit.sk (mailhost.netlabit.sk [84.245.65.72]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQ7tC6KSVz3wHJ for ; Tue, 26 Jan 2021 14:10:27 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from zeta.dino.sk (fw3.dino.sk [84.245.95.254]) (AUTH: LOGIN milan) by mailhost.netlabit.sk with ESMTPA; Tue, 26 Jan 2021 15:10:18 +0100 id 00849D25.601022CA.00003DE5 Date: Tue, 26 Jan 2021 15:10:17 +0100 From: Milan Obuch To: freebsd-git@freebsd.org Subject: git setup/usage question Message-ID: <20210126151017.4a9dd711@zeta.dino.sk> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i386-portbld-freebsd11.4) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4DQ7tC6KSVz3wHJ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd-git@dino.sk designates 84.245.65.72 as permitted sender) smtp.mailfrom=freebsd-git@dino.sk X-Spamd-Result: default: False [-3.30 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[84.245.65.72:from]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[dino.sk]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[84.245.65.72:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:5578, ipnet:84.245.64.0/18, country:SK]; MIME_TRACE(0.00)[0:+]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] 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: Tue, 26 Jan 2021 14:10:29 -0000 Hi, I am working on new workflow setup after svn->git move. I did some tests, starting with Warner's Hacking Blog at http://bsdimp.blogspot.com/2020/10/freebsd-git-primer-for-users.html and trying some suggestion and ideas taken from both this and current=20 mailing lists. After gaining some bits of knowledge I am going to create something more elaborate... for me. What I would like to achieve: - use one repository for all branches of interest and as working area too - use separate working directory for each branch and working area (possibly multiple for multiple projects) - track remote repository periodically and update working tree as needed (immediatelly after repository update or delayed when other work on a tree is being done at the moment). I do not see in this anything special, just the primer mentioned above handles basically just single working area case, which makes necessary some switching (via checkout of different branch or somesuch). So what I did: # git clone --config remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*' --= bare https://git.freebsd.org/src.git /mnt/src/.git # git -C /mnt/src/.git worktree add /mnt/src/main main # git -C /mnt/src/.git worktree add /mnt/src/13 stable/13 # git -C /mnt/src/.git worktree add /mnt/src/12 stable/12 # git -C /mnt/src/.git worktree add /mnt/src/11 stable/11 This way I have nice directory structure in /mnt/src, I can use individual trees for either local null mount (for jails and similar usage) or remote mount via nfs. Look for status: # git -C /mnt/src/.git worktree list /mnt/src (bare) /mnt/src/11 09bdde595dd [stable/11] /mnt/src/12 70cdab054c8 [stable/12] /mnt/src/13 da2dfec8f75 [stable/13] /mnt/src/main 25cdacf79b0 [main] Nice! Clear, easy to understand. With some scripting, this could be used to create id string for uname use (there is a thread about this on arch list, this is something I need to think about especially for remote building with sources mounted over nfs). Now for updating, trying to fetch... # git -C /mnt/src/.git fetch =46rom https://git.freebsd.org/src * branch HEAD -> FETCH_HEAD This looks like there is nothing new to fetch at the moment. So waiting a bit for new commit... waiting a bit more... trying again... # git -C /mnt/src/.git fetch remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (5/5), done. remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (5/5), 42.60 KiB | 484.00 KiB/s, done. =46rom https://git.freebsd.org/src * branch HEAD -> FETCH_HEAD This time there is something new... I need a merge now. # git -C /mnt/src/.git merge fatal: this operation must be run in a work tree I am a bit stuck now. What does it mean 'being in a work tree'? Doing 'cd /mnt/src/main' or similar before git command does not change anything. I read 'man git-merge' but still no clue. It must be something simple, I just do not see it. Also, # git -C /mnt/src/.git log does not show new commit yet. If I do 'git pull --ff-only' command (with another git repository, created exactly the way mentioned in primer) at the same time, I see new commit in log output. It looks like log is updated on merge, not fetch, judging from my previous litlle bit of experience with git, so this maybe should be expected, I just do not know. So the big question - did I the right steps to achieve what I want, descibed in the beginning of this mail? Is this way OK to use, or should I use some other way to achieve this? Regards, Milan From owner-freebsd-git@freebsd.org Tue Jan 26 20:51:49 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 C3DB04E015B for ; Tue, 26 Jan 2021 20:51:49 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic311-24.consmr.mail.gq1.yahoo.com (sonic311-24.consmr.mail.gq1.yahoo.com [98.137.65.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQJnJ5Rgzz4T1v for ; Tue, 26 Jan 2021 20:51:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611694307; bh=SLBNQKEqUZqsCMpJkNpKb2MEXrZvt8Blfs+8gT+OjX1=; h=From:Subject:Date:To:From:Subject:Reply-To; b=sVpLJtEoolWOqFAlKrtR4VG+dmpMLfJxxZKeR3RHZ9jl1cKWgHrLU1LYUKYEo1oqhu4SjResQ8JR80UIq7BSEXoFZIJ2DOPmA5b56180a/yDpNWaeBduRbVggN46m6Ky/wQolkps+mAqJmY+bfXorcHStbcJQoqh028WpwJ0j8+wkHnMTm+piRJSIBQLOeh/upssqxo8niVfjEzOrVNFr59nhmkFVqjTD5gARA33CXOafhhIO2tah6CgklFdCEEOnKb9XIn//qORuCB2YyAh6x6XLInfTSVxvt925u21DPmwdGxlQU6z97OlA5Rv32n+KDmNgQwJt1eadX8zDV0SJQ== X-YMail-OSG: 1JU.NJIVM1n6RiAb0QbINuBsh346oXerPoPizbfvQxdOpbYNRN16YkqVSoowNN3 EEURaudejSdX6j6CmagC2WhNXd9mum5IxfHbAA7r.6NIBVZtrgzvZlWDe2_t7ebRQBlil4x7uKuT aPIL5GOklXqcDJVmiQNpVnbYxqdO1uy9H4P_rzuysYvWX2ggSP.agPOFO5CoWRp4r9ohmXpGiuXd cmDk3j7yUVvzn5hCqkD68p70EpBX6MhhzL5NOAT5oeBV1e0bAFgV8g25Hb0jyAtyF6A3CNnOkZz5 n5sAweZUU5k6woQHlTp5EXKDW3QPr37XyO4UKCu3gCgJZaTWKkUapQPt_qqDF9gGjjN2D7.CEfAN 8Lg_C.5ptKfZEI4NYl_Ei1CT6Ybcu3PsRGZGi1Clf_AWwiO43omiPwpPecZfCsxYYQeMRD1UeyaZ UnhBi9vEzukmBTlv7rqGCGBqKRUyNNZlXkzuTCPdKhMPJwKOE1DXfw7t76Vy2YCxNrKYxRNfbAK7 Sb6kbpVDefddunHyrjxrX17wYioOPkXY4.5Vi3q6Dt54sfSJzNoQDxXZZHj5bto33ajW7sfJL53e vM0v4qDRVYpSDUEiFPwNjB8lUqo5si1K.z4HKuj2QhzcF3FjXQla8iL3Lb6CIh9F7TpyfYJNuxFW kfhoYfKoAEW7_x8kSG4q0pXHlKHdzdizO658TLlAW.n1PRgg2QvMkXO5RG3aUNHc_kkHFg374bdO RCN9_ABPaUOalXqM1Jq7yYuMnmB9tKhr5o_e.nZktfflEyGkQXrZyM4uoGs_UBPjwv1iMMiDgHbV uIm62Ga9LI35TRIIRTl4yCTZ9khVUslGflCF8z5cY.zWSbmDfFqRQmfeWLj8ClTdXBXuO2ndqINT triv_JLdzdTtZVmEbZK41SvHHy5nEtjId3xpqUzleXwiaJAxaVkHma5yQB1HrUweDRNdKWbZ6Hr2 nHGK2Bfk1m.B3f8XkevPidY7Rb6LXrZMXA6R7yNaTxie.LU6rtiy73jUwciEvrSZzZBft5IZJVEg 2KX8PIC74gMRrvs6rllpgBLXyLt5MPny7NBpGcQ1bjp6nOx0U1f9OpNkADWIKjxxybVaFR_yIZcM xws2kuY3KJMhrSPgv._MDMXxTWfSUjG7mh8KUrLdtZ8co.MSXE8V2nRyI1TFNdzHn7lJ6nepDF87 w2oG_c78dQezbgMdY.XwK.sTyd9wMZ0mI99eGP9aMWpPdCitfoId3XMzM9zLuO1KNl.p4FVV.yvT uxvHVJ69PoEhvwMkTKstkC6WaBTARx1y.UgwVpwzwNpekSSQhAncXswO9nVkiJIITH.JNKVg527z avHyQaHNbdC22yjFODDVR4XFKPUCC5FUY88qG.7i_YV.yLkKl4H_q0qXx2L59rC0I1LoGSpDbVrc diPLXVcdYsmefBI6jVSJAtBvXQD2LWdGiyzALSTFjmlIYmmFSd_HqArcFz3iR0SMJ4q5s53DdeYw By1..B9VFFQzsIOeOnDA4s7ExIDIIheMypLpJUnuVh8d98mMfq9Rbt1CRaL2_g49q58o2rBxq0lk VqnKBKHSs6IVMg40jRquwnYsgXfxl9E16yz1HUIkKxwfB7bg.Bi1JNadtw3HuXmY2DKs3FQaC33E vDmet3aWr9H7IzzST6Vb76hFH5vMFb8FXzck_JUdTsuLE8plIh815HWcmCmVPKTNRo.5lMlE3hri 5rikiHocJkTr11qdA0gN0J0E5BM46ZSnc1687cHZ46OpBHhR8szRGtDrW5hcbtML3GH_j48_aKxB mMhQcg_yhFakY3rYts3qqdLN3q7YHWA0iv00Br_edjMOXAC1a2kYCYiZKFCrquZoKupWBzI301Dy 3e3IhZIxYYXYNHjnULjFFZ9sNFJMzEB16f2P8RWL6ywHgRC1eL5y4CN3IIKZdyeK2DRYKDuUIEZF F6SzIz7cfljjt8P6IkChIUmQQzDCqeiA0aIGy3eJVPIMTvHCPA9t7fc80Tzx1YE5N7BU2U9HElUm sGrxx5hOkQMFmSy7pjjY6WkGCZ8vbdDVBufC7ZaKPt_pZvXXMrDN5WGP78mBXKjNYcuNsDBKDlkx xZTjr04AL2fivNam75OdGGRNdhvRCu3LXGBiADaHhl1i1R5lNNb5sAze9PU_cmInGsROyfVMDGSs EiXsBlPCoZ2muUvihpt2xgVPOjHtzd9gBuPfUjqfoR5kA1OzI7_CZOQesdNs58bbzR6OGkCtBuWC xWNq2ifJ0aKtYzI5vrr4ObBn9RreLMbrFJU7INQWf1JpKu9uU7BRNMh7e3HCRdd.8mrU0MmE4a9v i0rYHoOF8_1nRy7Lkw32FQNdlrc7hWFOAsZwdhJOPOcUcDqblPff44FP3bAy_k1nL.k2CUhaB_vk ljdAtU.Tj8_qPUoia6kuKTIRWeAP_9e0h6Vybp.qkai1emU.qXqYqLRdqaNezX5ZkUPuDC.yX2nl _wP3uRuBCksX3h2uR48m8FmDFgQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.gq1.yahoo.com with HTTP; Tue, 26 Jan 2021 20:51:47 +0000 Received: by smtp406.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 82691bb15afd5b5d594f6860e00b1323; Tue, 26 Jan 2021 20:51:45 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question Message-Id: Date: Tue, 26 Jan 2021 12:51:43 -0800 To: freebsd-git@dino.sk, freebsd-git X-Mailer: Apple Mail (2.3654.40.0.2.32) References: X-Rspamd-Queue-Id: 4DQJnJ5Rgzz4T1v X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.65.205:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.65.205:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.205:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.205:from]; RCVD_COUNT_TWO(0.00)[2]; 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: Tue, 26 Jan 2021 20:51:49 -0000 Milan Obuch freebsd-git at dino.sk wrote on Tue Jan 26 14:10:29 UTC 2021 : > # git clone --config remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*'= --bare https://git.freebsd.org/src.git > /mnt/src/.git > # git -C /mnt/src/.git worktree add /mnt/src/main main > # git -C /mnt/src/.git worktree add /mnt/src/13 stable/13 > # git -C /mnt/src/.git worktree add /mnt/src/12 stable/12 > # git -C /mnt/src/.git worktree add /mnt/src/11 stable/11 . . . > # git -C /mnt/src/.git merge > fatal: this operation must be run in a work tree >=20 > I am a bit stuck now. What does it mean 'being in a work tree'? Doing > 'cd /mnt/src/main' or similar before git command does not change > anything. I read 'man git-merge' but still no clue. It must be > something simple, I just do not see it. man git reports: -C Run as if git was started in instead of the current = working directory. . . . So it looks to me like you need to do one or more of something like: # git -C /mnt/src/main merge # git -C /mnt/src/stable/13 merge # git -C /mnt/src/stable/12 merge # git -C /mnt/src/stable/11 merge /mnt/src/.git is not a working directory. Note that # git -C /mnt/src/.git log has the same sort of issue. The other commands that you list (clone, worktree add, worktree list, fetch) do not depend on having some specific, pre-existing worktree (working directory) as context for those operations. For those, referencing the .git directory tree works. /mnt/src/main , /mnt/src/stable/13 , /mnt/src/stable/12 , and /mnt/src/stable/11 all include information pointing to /mnt/src/.git as what they are tied to. So they tend to also work where /mnt/src/.git references are okay. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Tue Jan 26 22:13:51 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 EAA3D4E2946 for ; Tue, 26 Jan 2021 22:13:51 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from mailhost.netlabit.sk (mailhost.netlabit.sk [84.245.65.72]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQLby4lBVz4YLJ for ; Tue, 26 Jan 2021 22:13:50 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from zeta.dino.sk (fw3.dino.sk [84.245.95.254]) (AUTH: LOGIN milan) by mailhost.netlabit.sk with ESMTPA; Tue, 26 Jan 2021 23:13:48 +0100 id 00F40414.6010941C.000072D4 Date: Tue, 26 Jan 2021 23:13:47 +0100 From: Milan Obuch To: Mark Millard Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: <20210126231347.0d7c5a77@zeta.dino.sk> In-Reply-To: References: X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i386-portbld-freebsd11.4) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DQLby4lBVz4YLJ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd-git@dino.sk designates 84.245.65.72 as permitted sender) smtp.mailfrom=freebsd-git@dino.sk X-Spamd-Result: default: False [-3.30 / 15.00]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dino.sk]; RBL_DBL_DONT_QUERY_IPS(0.00)[84.245.65.72:from]; SPAMHAUS_ZRD(0.00)[84.245.65.72:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.998]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEMAIL_TO(0.00)[yahoo.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:5578, ipnet:84.245.64.0/18, country:SK]; RCVD_COUNT_TWO(0.00)[2]; 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: Tue, 26 Jan 2021 22:13:52 -0000 On Tue, 26 Jan 2021 12:51:43 -0800, Mark Millard wrote: > Milan Obuch freebsd-git at dino.sk wrote on > Tue Jan 26 14:10:29 UTC 2021 : > > > # git clone --config > > remote.freebsd.fetch='+refs/notes/*:refs/notes/*' --bare > > https://git.freebsd.org/src.git /mnt/src/.git # git -C > > /mnt/src/.git worktree add /mnt/src/main main # git -C > > /mnt/src/.git worktree add /mnt/src/13 stable/13 # git -C > > /mnt/src/.git worktree add /mnt/src/12 stable/12 # git -C > > /mnt/src/.git worktree add /mnt/src/11 stable/11 > . . . > > # git -C /mnt/src/.git merge > > fatal: this operation must be run in a work tree > > > > I am a bit stuck now. What does it mean 'being in a work tree'? > > Doing 'cd /mnt/src/main' or similar before git command does not > > change anything. I read 'man git-merge' but still no clue. It must > > be something simple, I just do not see it. > > man git reports: > > -C > Run as if git was started in instead of the current > working directory. . . . > > So it looks to me like you need to do one or > more of something like: > > # git -C /mnt/src/main merge > # git -C /mnt/src/stable/13 merge > # git -C /mnt/src/stable/12 merge > # git -C /mnt/src/stable/11 merge > > /mnt/src/.git is not a working directory. > [ snip ] Thanks for hints, this does explain a bit from what I see, however something is still missing. When I tried what you wrote # git -C /mnt/src/main merge or what I made from reading man pages and Git Book referenced in Git Primer, # git -C /mnt/src/.git --work-tree /mnt/src/main merge all I get is fatal: No remote for the current branch. so evidently no merge is actually done. Something in my setup is wrong or missing. It's late here now, tomorrow will be another day to try something :) Regards, Milan From owner-freebsd-git@freebsd.org Tue Jan 26 23:15:32 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 D94D34E422B for ; Tue, 26 Jan 2021 23:15:32 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-21.consmr.mail.gq1.yahoo.com (sonic317-21.consmr.mail.gq1.yahoo.com [98.137.66.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQMz75GwXz4cmt for ; Tue, 26 Jan 2021 23:15:31 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611702929; bh=xqZvycZsIXS4B8WJP+5ez56dpHF1twriPvr4UlYpgow=; h=Subject:From:Date:To:From:Subject:Reply-To; b=N0N5a+S4+b/Zf0QE0sOpMVx99tXhuM5Z4SDEqhYW6mRJAdEDteY4sKCt9XdThtiNlDUwpWuebU6kwDzqzssIplH6fG//BoUnzUHUjqjjcs+hQ39K5C8SJi7gcmvjW2+MNwc/l4FEGHGm4vJ7uAgFqYFyujVPGV40C9hIaf7j9TJzrwn9UuqM0wR9RX2kTboXfzE/tDV50EFI8McsCnVHVa2LdwCtt6D6yRw1VlqgI43GXUUjxE2I2b+jaAE533246BRNiP28AZ9Jcpl3sfmzaAa8BFtSnsap3i08HG4TxI4dXmKxtCs9t6cFyRbmWp+gIPgzPWLLPiNu8oR3CIUM7g== X-YMail-OSG: .lVBGmUVM1lToLs2FWYjObx4VUKcQ99KZlRH0Or8KN47k0LcWStbVGxQKL8SRh2 qTJiaBRQRN80Fn9ZWKfkkGKPKwuO_ZW7lBKZYQbxjWla87KqMqmg4w.9BOjnSOGgjYtlVl0XID3b IXwdAXN7_bN8UHQN_wmEBjmFs_EdCTl1WG8lDct0QWIxa2MRhgSfLXgLPaVK4OTWM5Feidz1X7w. 2AFtmLx__P1fzwnjDCTBv9GvXK_BB5.hKzpN1U7esG4eOuTubYXnjEFWqsmVvANTgl6pcies7TWO Q19BELpsH6NIweLF0yHU5zIEf2POB0gnzNcw9cLwegWx.LV9iCd44T_zdiNlxSmtR2qwef2CRisv VPjlZKzKTpOMUf2yAiFGLSsvMQe14DN9Id4doPatFA.HNWDEiElgf2kFjsVIrjiHKhn7etPC7cDL 6frKVlPGI6qj4ZCpcQUnFruvb7uqSUKoQjXBXeTrPoUzklzmYePJh7iN.KryCJiL1VKkUtpXYAMb Vtjb68QwxwF4SzoTE_HMKcMwmmwYNNShut.7u8q42CnhPMNkJ8JfTP_y8PjuI4iWLdZEGCRQ70hJ 9v16qDbNytn8PiBb5BjXtbs5UTz9OrjsEeje07RI.PeERd2QmVQyUzdRilPClR14ZVnCgunXUtrN qmOQJtM_rG32oPmXlT7jHlhH_QvwJnPrayALEJI2tJggKwn9mFZ.e7ifx8hRXfj4eM_FQn7x5w39 zIRVftVkyWzNf7SeY73_MkVHZ2sxfYmOlfw9kviQD822rPvyT9tLvzUp4i5lWpdmI.Unq6II2MOY frsQCR5tijItr128jP5UVrNwqUnfBVesf3pAXI7IUThAQLjK5m7Qx81QFSnlyWp49V.vkU6mQHjS BnaHjmc049hdNgrCtpnCUJKeBoei2Uxtl4PTTgZbE82.XVta3GxR2Ntl6Uih8E5cUqyGDGF73kjS zTbjsA_Dd2hV0aGGmDa5ZRMgEL5m9XMqvcz53TuehxNg02vjMllHE_T9ePV3nsCpkWmea04SYj56 Oft7XEkapR.2HmMnW92ALIn43xY3oBzPuxUmuyKm7Ugu99QRNBoCgkK4zxdEKuQRxo.njRe9oMH7 ayDL_QfKlnCyKioeZfaVH8RxgmZRwPAgcufyeuwT_n8n5kk4Ayndhp25d00ls8whRdhKp2IeJIY8 XUjy6fVYET68ItmtKhYuRtbo3p.RBjDJQPyDPuFj5WU2YTOV6soMiD6uE5BdKrnRqW4Ea39Lw6Mk 5ETXXKJCI6faD.5H_ScvkoWgQdjrtJv9gab7qaSTnngcHsnL2.ky9fseqyqqK3LKAhmXjgQ4Fbv5 h5yS0ewl6U53xbPtKRfy5eNqyh9sIvDuCj5Gy1XoPqc.HvESq4CeO9dbAOb82_WhXVTXvXZH_Krj jX11lCGLjXbWIjjLF5jvZoNnlP.A5lK2pT.j.oiesDa1ux9RB08MWGMNkMnI64ZN0VrWuJuDPaMY WkAsL3GJQoo6KBgKbX1Jq0M_tseW_9Ggxfwvg94bIStO2cvI48zoF7zi3KBP5N2HOidxTX4dw5XT l8g79WCvXvG9rlm3a6VXl.kMtO9rLunhitBmI8smOjxaUaSFkXkMB15lOUeDdQ.25gryPO2uwoRi 8K3HtV5Uij_H3ImPyY1UZqb2k1ujLHRj8EmJa00pa7wqccPSIiEVt4nqKpr27LBuQVZfkQYYUxwU lzlRtPrNVw2YWPkcRdhjMYEUqism9HbLzwc5E4xYyDtuLb2yIidTchSpZP_gWeRfSYSnmnj4nNB8 8s__YZXDZtEJz7hFzwpTa0H6Wzg9HdTufFiTmssLN1XRDPPIgbjc.nJ70DF_akagPzrOuvLOTQrY rdpIakDVr.7X1Ct0zMRXKsHSCJcIf3gTw176_DGXMvRQnO..lvqqSAbjFbNep3SX3bHioSgycXB0 Q1HSWbQEboVNuo_Ib6V6V1Gz5FABjT2uh7eCGhfMMXCbnP9lkxbBegknen.JAqZZc5YHYuWCSqY4 ApLbHdNks3Vx4zSf5322FpqQ1QzRFEl3Ab5HsPDju_7PAnuyDpubTEkhU.WzHXzuHri8T8X0F9d1 yBOzVq0PjVJSj3Qb8KzYVpW.TvjtL99IggMcB011F0iOzSNsI2xFqtY1PeZK8N6xm.aB4Re9Tf2d p5IZ61mE1pMeS2grhj5hsiQig6HZ3Oaau1j6hAssE4OjHtSS984ewtz7fW0Lv7NbqtOkNQYH7z_w SSH_7a2LG1EB6UQW9YFvxcBophFrxKx9drIrV0wWQocD0JMTtGEQrF7kOruebU1dZ5uef7AiAEaI u9OteTYfC6.u22OKumm0bPvGN58er0Th0G2T2PoQLi2bXFd3SiBqP8XRwywS4nMs9kZghtHrUPmf ikRDvXShLfydV5ChDYH_TZowZFKbIhxhDbE1Tcpdq0HAfqzMQ2pDYJd6uSVTS1YMVW_s3IDOWe_W eIiBvL1wTlYoMBveHy5Tw8SSu4EOU3w7xXLTbVvXJi2aUmTzY.jZ0q4PdrF4- Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Tue, 26 Jan 2021 23:15:29 +0000 Received: by smtp406.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 6ed1692ad7ff32f9dd454e666207dbd2; Tue, 26 Jan 2021 23:15:24 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question From: Mark Millard In-Reply-To: <20210126231347.0d7c5a77@zeta.dino.sk> Date: Tue, 26 Jan 2021 15:15:22 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <20210126231347.0d7c5a77@zeta.dino.sk> To: Milan Obuch X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DQMz75GwXz4cmt X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.66.147:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.66.147:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.147:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.66.147:from]; RCVD_COUNT_TWO(0.00)[2]; 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: Tue, 26 Jan 2021 23:15:32 -0000 On 2021-Jan-26, at 14:13, Milan Obuch wrote: > On Tue, 26 Jan 2021 12:51:43 -0800, Mark Millard > wrote: >=20 >> Milan Obuch freebsd-git at dino.sk wrote on >> Tue Jan 26 14:10:29 UTC 2021 : >>=20 >>> # git clone --config >>> remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*' --bare >>> https://git.freebsd.org/src.git /mnt/src/.git # git -C >>> /mnt/src/.git worktree add /mnt/src/main main # git -C >>> /mnt/src/.git worktree add /mnt/src/13 stable/13 # git -C >>> /mnt/src/.git worktree add /mnt/src/12 stable/12 # git -C >>> /mnt/src/.git worktree add /mnt/src/11 stable/11 =20 >> . . . >>> # git -C /mnt/src/.git merge >>> fatal: this operation must be run in a work tree >>>=20 >>> I am a bit stuck now. What does it mean 'being in a work tree'? >>> Doing 'cd /mnt/src/main' or similar before git command does not >>> change anything. I read 'man git-merge' but still no clue. It must >>> be something simple, I just do not see it. =20 >>=20 >> man git reports: >>=20 >> -C >> Run as if git was started in instead of the current >> working directory. . . . >>=20 >> So it looks to me like you need to do one or >> more of something like: >>=20 >> # git -C /mnt/src/main merge >> # git -C /mnt/src/stable/13 merge >> # git -C /mnt/src/stable/12 merge >> # git -C /mnt/src/stable/11 merge >>=20 >> /mnt/src/.git is not a working directory. >>=20 >=20 > [ snip ] >=20 > Thanks for hints, this does explain a bit from what I see, however > something is still missing. By the way, the modern version of Warner's documentation is at: https://github.com/bsdimp/freebsd-git-docs/ and is the basis for the documentation update FreeBSD will have in this area. In the Cloning and Mirroring section of: https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md there is a little material about issues with using pare repos. The Users section basically says that using bare will not be documented. (I've never tired to use a bare repo.) > When I tried what you wrote >=20 > # git -C /mnt/src/main merge >=20 > or what I made from reading man pages and Git Book referenced in Git > Primer, >=20 > # git -C /mnt/src/.git --work-tree /mnt/src/main merge >=20 > all I get is >=20 > fatal: No remote for the current branch. The "No staged changed migration" section of: https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md reports on using the following to clone with the ref/notes related material included: git clone -o freebsd --config = remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*' = https://git.freebsd.org/src.git freebsd-src Note the "-o freebsd" that you did not use. The coning notes in: https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md also use the "-o freebsd" (but not the refs/notes related material). > so evidently no merge is actually done. Something in my setup is wrong > or missing. It's late here now, tomorrow will be another day to try > something :) I recommend reading: https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md and: https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md and in using the conventions documented, such as result from "-o freebsd". =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Wed Jan 27 02:04:52 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 721F64EA285 for ; Wed, 27 Jan 2021 02:04:52 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-21.consmr.mail.gq1.yahoo.com (sonic306-21.consmr.mail.gq1.yahoo.com [98.137.68.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQRkW3fXQz4pPP for ; Wed, 27 Jan 2021 02:04:51 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611713089; bh=Gd9Ym+lKVVgfwMg45VK6NrX2ZVZp4gSDtTVMhDsx9DD=; h=Subject:From:Date:To:From:Subject:Reply-To; b=UGz1RNmTbS84vF2k49Pob7ItX/cDlzuY2zyGFB8wBS6o3bMHKjDXsUEvAYWisHMUu3Hz7geZHXNJGAqX5Szh6SnLPM9i2GnVYCTCJovP4xvmVwb9+pBv147n+AN7h2n/wsGLS+KcMdh43XTCLRwUkufsjmJRltgUEF2g4koFoapJ8tbTvDaFBBWuB/5vxfih1VEw3NzfsF2ZpyAfJmlj61G25FbdQ+ypAzT2uBipdhBx81fxnKb3e04BscCDqiRPY+AnWwoAo0vQdADH0RVTIzM6cfFXFhhWroB/co31ujie+tWu7du9jexm6v8hxAs233POWMQADtDxX/6rhVD/4w== X-YMail-OSG: th4aKzgVM1k3LpVi.UXPoitMFUCLolYUv.DHWqeY1Z9zvA_MteE9Meh2g8amkux u_o5Wgf1Bm1U4dkeCngjTvMa4mo5lN0JsjEkMcKd3RnSrgHHmuFCbdHVlbzqApX60qiB8_gpGbqZ dhAL5_ETVGWOW8N9F1Ur4a7r1yfRoj1h5eXWUO5OscPaD4SXoRix3JWFCjTIUo7e9YzE94iGbuBN 3HhoSI0wqkR0q.QFD2wjPkEZ7aqMMZ4F18HLoUQhmtEAdXVzEIV3T4.FiPyT5gR9NibOXD0SNh.v nh7tdllRELwJlG1quCZpAotOEVfkX6SajuC3NQE8hGZ1gBzLHliqrO993FW5O5GPOSBe.R7plwQ5 ts6tuWTcGEFAWNesl8j54.Vm3IL1Tj7LRlRz6tauN2GWASkaXGExmiGmt98YxGz4uBFW1zUvR53G O7t4zSPNK567Eoz7bQQIHUAwCv5rCWgnV1Sj1YS73uHvjmYK0QYezf9B1uG2pqNTUN45z1oDd50_ 5OCAFeDT.0vWi57imYGA.VFOpY6el0gnR9MTinPUO54kxW0oluld0CpdBgzekUctdL2BaT0CfpGX rlY2TQJY2pMp.KtNzeeqa8MvU0FIyQ7iRFY2IBbBXUp.9z6tFt1ZPyRHvCr7phDdX7fO_HVchHHj xZEkW2wuDYGSbayTjLKRJ82.A5daSgbXUzG_JfTN7dBRoNO25tA.Lek47ycPqcSZDY.ys6kJrFzq i.LOvrVZ7EMYZ9KRO9NQVKcv9I8W4_DE.4xBQkmDFAB2yMkZ0BklIsjcFioRHIsWqWeDGiHnpFuJ tBUrrNmcerEo6QWBt9CELIRGkjtMt9DLG_5LpY2hY6YCstk_EZMAD8_moI1YCA5vfqRXaJ_KHdSz jKlXQpTU72GVyouSFvTNt5FAu3hWSCKptcu6lM3KvaxtWXfMqoRHtUeGQuljWeWkAcjJX0Qvrw9J UvUNlyUwO8HY1AKd7JOzTYFBLgjejyzE2ych1L6JEEhLApruMvZO1koxI3iB.j3IbDD3C33HSj2g Cg_o0FDB2U69KgpMk4FNBB5z1fqKtHDxHV7DQNrE9yDH_GVTjtpmdm0U9l8PSijcX9kp50O8lvKV I4rTWZ0mQLl2M0jnBwFxJnEpLI1Qica6ZtUBsRKxEnP.30vYOnO5Rd7suoi_7GhdOfSqUzG3uLif fi1yRFqT5lctdoZfpyb34.ECWuxWOvt0H6sG6jYVuJVRjqw1HfB.3Gdot.vsdmTw10AjJQF6KzLe jzX.xtUFl02tuSZv1ZQ.JR6xdB36PD46qinXjB43CT0IOZEZm6NMIh4Ax8X24_SeqXVeJ6qtiYuN rSdiAF_7oWpEyjLkeLdE135wFFObJnsiPMt6xhki9zW1eDeL7BvRu_LTWECeyumJIm3LeBfdoBVW iu38CRzMqDhMwf8124_KZ6QgNMQhDvqR118RWuCE2XXl4jnCwwW9cMwlcTIYAYbWk.QLHJx38jBl d.74uWgkBQb58WvImrH6mxblH4E.K29OlWFcRV3_dC8TfDtlmU6vRP1pdM_CrTac6Fdl8wFusRD7 uU5gudcTH1vSzZYPwFMSxrf5Vmov6f5.qzKaYB95eVVEaI1tD51v7l8rKabCP0hbCeS0X5OgokJu ry4nILaOnM2pFfO_qqkkmIbIBWAX6_BS4ChJUO8_M3OTcwC9p31vDIwIeldpZXqYGQmKGOMilQSO CrpWhxn6w9IcToHSOlvDix15NlA8L3mmu0Ay7tGu9cjtheW0zgRTlgj5Mzvx.CuFqNyaejCW7tU6 qw_XFwZM28qY2SPREcSl9O55pxJ0O1ig74ur6HYZCEjkUPzi8xdvCSvIgUrSKD6KoVez8TrjwmfA NjZfsYrugdW.QyiIDKeKjYTyTsP5G496H9XROghFAIoZfSZyBVbFRy9wrFyCNJRK5cN2HfSf9obl DEqA7HRZx3mDyB1c8jqRbLGnrBll6bd2vJeIewyNlhvEiNPnasciQaxVYJd7lbc4naxOoSHV8z25 mHUKQ.LtS2PGmGqfgDyuLkc8zZq13cm81zsPy3hPla.wPF7_iV_zPIrBu2EM562QKFsVt_m6MW_T 8WVWcTjdBqdnBPgkgDL0qWzsKEXB1PlMW1uiDzQvmTVFzrZeWZmcYkY8xwMpjSUozw3oIAtOpTN7 mLIOa_hwAujV.rVoh_HOnZLlRa5l69c.ZefHV7YR3KakB2w_4h93RKqNSYvdPtTx0mdQfG8r8bpC mBHeoqwAE1Za7DLvoyvnYphsqOcSJtyChkbg3dMLfxYgqC6JDSw6MYm0UPs4KUOw0jtAV544Dw3z gCJ_beD5w9ajxjk2izW49MhBjQoJtKw5YaXlwUsCTTTL3.waxnmJlmnSx59D3FZcCqj6RvJYHvFn oiMld6HiNJ_CvwVWX5hLUcWx_o2Yg_1pkEAaM7Mh7qPVXmrnxgSjrgSvD09hFymYpOze.OYOE.Ft GbBLtXkikEZp39B_gt0vF.3qvoxhBHj7gyWvqDGHRP5h3WdeMUNBnWZsr5YIygzk- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Wed, 27 Jan 2021 02:04:49 +0000 Received: by smtp418.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID ef1dd513a20fcfbf4c30428a6a764167; Wed, 27 Jan 2021 02:04:46 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question From: Mark Millard In-Reply-To: Date: Tue, 26 Jan 2021 18:04:45 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <29570D03-7BDF-4778-8E5A-9CD4E03C4D76@yahoo.com> References: <20210126231347.0d7c5a77@zeta.dino.sk> To: Milan Obuch X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DQRkW3fXQz4pPP X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.68.84:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.68.84:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.84:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.84:from]; RCVD_COUNT_TWO(0.00)[2]; 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, 27 Jan 2021 02:04:52 -0000 On 2021-Jan-26, at 15:15, Mark Millard wrote: > On 2021-Jan-26, at 14:13, Milan Obuch wrote: >=20 >> On Tue, 26 Jan 2021 12:51:43 -0800, Mark Millard >> wrote: >>=20 >>> Milan Obuch freebsd-git at dino.sk wrote on >>> Tue Jan 26 14:10:29 UTC 2021 : >>>=20 >>>> # git clone --config >>>> remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*' --bare >>>> https://git.freebsd.org/src.git /mnt/src/.git # git -C >>>> /mnt/src/.git worktree add /mnt/src/main main # git -C >>>> /mnt/src/.git worktree add /mnt/src/13 stable/13 # git -C >>>> /mnt/src/.git worktree add /mnt/src/12 stable/12 # git -C >>>> /mnt/src/.git worktree add /mnt/src/11 stable/11 =20 >>> . . . >>>> # git -C /mnt/src/.git merge >>>> fatal: this operation must be run in a work tree >>>>=20 >>>> I am a bit stuck now. What does it mean 'being in a work tree'? >>>> Doing 'cd /mnt/src/main' or similar before git command does not >>>> change anything. I read 'man git-merge' but still no clue. It must >>>> be something simple, I just do not see it. =20 >>>=20 >>> man git reports: >>>=20 >>> -C >>> Run as if git was started in instead of the current >>> working directory. . . . >>>=20 >>> So it looks to me like you need to do one or >>> more of something like: >>>=20 >>> # git -C /mnt/src/main merge >>> # git -C /mnt/src/stable/13 merge >>> # git -C /mnt/src/stable/12 merge >>> # git -C /mnt/src/stable/11 merge >>>=20 >>> /mnt/src/.git is not a working directory. >>>=20 >>=20 >> [ snip ] >>=20 >> Thanks for hints, this does explain a bit from what I see, however >> something is still missing. >=20 > By the way, the modern version of Warner's documentation > is at: >=20 > https://github.com/bsdimp/freebsd-git-docs/ >=20 > and is the basis for the documentation update FreeBSD > will have in this area. >=20 > In the Cloning and Mirroring section of: >=20 > https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md >=20 > there is a little material about issues with using pare repos. > The Users section basically says that using bare will not be > documented. (I've never tired to use a bare repo.) >=20 >> When I tried what you wrote >>=20 >> # git -C /mnt/src/main merge >>=20 >> or what I made from reading man pages and Git Book referenced in Git >> Primer, >>=20 >> # git -C /mnt/src/.git --work-tree /mnt/src/main merge >>=20 >> all I get is >>=20 >> fatal: No remote for the current branch. >=20 > The "No staged changed migration" section of: >=20 > https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md >=20 > reports on using the following to clone with the ref/notes related > material included: >=20 > git clone -o freebsd --config = remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*' = https://git.freebsd.org/src.git freebsd-src >=20 > Note the "-o freebsd" that you did not use. The coning notes > in: >=20 > https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md >=20 > also use the "-o freebsd" (but not the refs/notes related material). >=20 >> so evidently no merge is actually done. Something in my setup is = wrong >> or missing. It's late here now, tomorrow will be another day to try >> something :) >=20 > I recommend reading: >=20 > https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md > and: > https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md >=20 > and in using the conventions documented, such as result from > "-o freebsd". Something that I wonder about your use of -C /mnt/src/.git . . . There is also --git-dir=3D/mnt/src/.git . I wonder if you always should be using -C or if some or all the time you should be using --git-dir=3D QUOTE --git-dir=3D Set the path to the repository (".git" directory). This can = also be controlled by setting the GIT_DIR environment variable. It = can be an absolute path or relative path to current working = directory. Specifying the location of the ".git" directory using this = option (or GIT_DIR environment variable) turns off the repository discovery that tries to find a directory with ".git" = subdirectory (which is how the repository and the top-level of the working = tree are discovered), and tells Git that you are at the top level = of the working tree. If you are not at the top-level directory of = the working tree, you should tell Git where the top-level of the working tree is, with the --work-tree=3D option (or GIT_WORK_TREE environment variable) If you just want to run git as if it was started in = then use git -C . END QUOTE There is also the issue of using =3D or not for the likes of: --work-tree=3D/mnt/src/main or: --git-dir=3D/mnt/src/.git The man page always lists =3D for those two (not for -C use). QUOTE --work-tree=3D Set the path to the working tree. It can be an absolute path = or a path relative to the current working directory. This can also = be controlled by setting the GIT_WORK_TREE environment variable = and the core.worktree configuration variable (see core.worktree = in git- config(1) for a more detailed discussion). END QUOTE =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Wed Jan 27 07:24:50 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 27B814EFBA4 for ; Wed, 27 Jan 2021 07:24:50 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from mailhost.netlabit.sk (mailhost.netlabit.sk [84.245.65.72]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQZqh6MZ9z3Kws for ; Wed, 27 Jan 2021 07:24:48 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from zeta.dino.sk (fw3.dino.sk [84.245.95.254]) (AUTH: LOGIN milan) by mailhost.netlabit.sk with ESMTPA; Wed, 27 Jan 2021 08:24:46 +0100 id 00F575D9.6011153E.0000C2D7 Date: Wed, 27 Jan 2021 08:24:45 +0100 From: Milan Obuch To: Mark Millard Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: <20210127082445.2ff4ca6a@zeta.dino.sk> In-Reply-To: References: <20210126231347.0d7c5a77@zeta.dino.sk> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i386-portbld-freebsd11.4) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DQZqh6MZ9z3Kws X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd-git@dino.sk designates 84.245.65.72 as permitted sender) smtp.mailfrom=freebsd-git@dino.sk X-Spamd-Result: default: False [-3.30 / 15.00]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dino.sk]; RBL_DBL_DONT_QUERY_IPS(0.00)[84.245.65.72:from]; SPAMHAUS_ZRD(0.00)[84.245.65.72:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEMAIL_TO(0.00)[yahoo.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:5578, ipnet:84.245.64.0/18, country:SK]; RCVD_COUNT_TWO(0.00)[2]; 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, 27 Jan 2021 07:24:50 -0000 On Tue, 26 Jan 2021 15:15:22 -0800, Mark Millard wrote: > On 2021-Jan-26, at 14:13, Milan Obuch wrote: > > > On Tue, 26 Jan 2021 12:51:43 -0800, Mark Millard > yahoo.com> wrote: > > > >> Milan Obuch freebsd-git at dino.sk wrote on > >> Tue Jan 26 14:10:29 UTC 2021 : > >> > >>> # git clone --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' --bare https://git.freebsd.org/src.git /mnt/src/.git > >>> # git -C /mnt/src/.git worktree add /mnt/src/13 stable/13 > >>> # git -C /mnt/src/.git merge > >>> fatal: this operation must be run in a work tree [ snip ] > >> # git -C /mnt/src/main merge > >> /mnt/src/.git is not a working directory. [ snip ] > By the way, the modern version of Warner's documentation > is at: > > https://github.com/bsdimp/freebsd-git-docs/ > > and is the basis for the documentation update FreeBSD > will have in this area. > > In the Cloning and Mirroring section of: > > https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md > > there is a little material about issues with using pare repos. > The Users section basically says that using bare will not be > documented. (I've never tired to use a bare repo.) If well working setup can be achieved this way, things can be changed... > > When I tried what you wrote > > > > # git -C /mnt/src/main merge > > > > or what I made from reading man pages and Git Book referenced in Git > > Primer, > > > > # git -C /mnt/src/.git --work-tree /mnt/src/main merge > > > > all I get is > > > > fatal: No remote for the current branch. > > The "No staged changed migration" section of: > > https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md > > reports on using the following to clone with the ref/notes related > material included: > > git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/src.git freebsd-src > > Note the "-o freebsd" that you did not use. The coning notes > in: > > https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md > > also use the "-o freebsd" (but not the refs/notes related material). > Yes, because git said --bare and --origin are in conflict and can not be used together. > > so evidently no merge is actually done. Something in my setup is > > wrong or missing. It's late here now, tomorrow will be another day > > to try something :) > > I recommend reading: > > https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md > and: > https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md > > and in using the conventions documented, such as result from > "-o freebsd". > Thanks for pointing to another material. Something emerged from this discussion. I did a bit of digging into config file in git repository now and it looks like it is possible to get what I want with some editing there. It should be possible to achieve it via using 'git config' as well, but as this is my first attempt... I need some time to verify working status or fix issues now. As soon as I get feeling it is OK for me I send new mail documenting what I did and how I use it. Regards, Milan From owner-freebsd-git@freebsd.org Wed Jan 27 08:18:41 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 262164F15B3 for ; Wed, 27 Jan 2021 08:18:41 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-23.consmr.mail.gq1.yahoo.com (sonic312-23.consmr.mail.gq1.yahoo.com [98.137.69.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQc1r0z8Nz3P6D for ; Wed, 27 Jan 2021 08:18:39 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611735518; bh=3cfk49qOizkMLBXj6Q8x0GH75MZzexKfKx1qf1zidQG=; h=Subject:From:Date:To:From:Subject:Reply-To; b=Xf28cemFxOYtwTPV6W2GYlqKwJFiEOp5upT3xxJcM029VwsgpevD4VZhhe6JUdPlBX+5LhqCNI6waZIEBTNvJTe34LJj7Hq/nlBEpqCpDuOcsXOS9JcZm+DGf/RBntj6tnQQSlv4eDiLzLtZlvG7lV0exXKWBLK50iIJmadPVIPjDjTtzzhCkyWqUqaLVaH77e9NLNVq3IZZbGs24tNafhAQFyPE6PXSp1ZcYbSwYQhGVHOw+9jcBO4pOipeG4ZRZZJ91IocTJU+M6oXFPL/TEDugnbMWsXKc5XO7GT2zz9DSDqZhFTD/tiZGml6LiTas7/77jXUuzl16zmzSL6phw== X-YMail-OSG: I.DgI1oVM1lJQ6YE2S0yT5mq1x5xPoncMgQGxL2AXg97WIW_4PPfEczpEE8.gXP gbOBBfBhVvrwS6ZBukm7XY9NmzoQddB4QpvT2Aq7lbwUZfBoerRYGS1ghDuahV6cTkvaopi8KX2G zKZn88NoE6cvMCBmAfV5aCk1S6lb5MThY8NgAkXdOtoOtXTnlcF_fztZHv1sPBMpyuDyWmgjtWrf IiZDRviKQ6cluQFniH2HWeAwH6wljYOgyz9pOiBlPYHjXjpVsoa4Y020IyzsaJSp8ILJfKSUGddV DC3.pGH7R2fdZe.78Eow4GXLLeq.bX7iZ_b.YBvMXQOcQUMgpF.uTZV8VFdexLx9fo7vLjyTjxZP N4X3gGhOhBPppKD.MRJxGzRO_BeLHG_P5Vl7A_eqnJMdQQu8I0SdoihwqFt2ntrEF1xldUXpcKxy QKEn11j.GWs0qIIbINpmRpbkwwmhrySWL8jhv_KTgOiFey6c95A_U9MzWmPjhyT8o2EHrYoM5Hjz c9l4iB4vGdmCmCJBFDco9uxLrk9KDUX3pt1Av.Kl6crHvcC39o2N6hCiKSNL_i31CdVnLzVUtgcc ho.ATnQdKltIaggTs7_0la447X2S0POLqmqi3ri0ELviRpIbL6uiDkETHyHFUqOqnZW1Vie.7fD5 amwGzgZQSNTQKUt2ZWSh3wkErf3Q1gTcPem5svkvQfOnGh.EM1Wn30hBG9E.apFOkowM8KPwG3h. cl4uJoSR81nrTP7YKnJK6tZxLGCvjWP5QmtBuQvlFHfvZehOYVEF9MmeJLfztHsL5vNnIXjd4YWi lbqly0IF6XKkgUxaR.tpACRs2.6S5HKvarS4J7JnBXB8g0X.OTazFQqrYGvpoXkJxnL0KLBMbhFH 8wqXS8b17yNJ2qqHKZXqoicxzOV_EPLIWqe.d3bXRhHHRviTiSQJNRz_hJIG4FUyzSDA8T.qs0yP kJ2za4xLln9cnuvXJve7mK6QoR3E4sY1nS03o1q_lbf7v0qR4h7S0m04tV28x70RMCt1CZR_XCYx pWzKRbJkavypZYcOsH_19XkfDzCHasr1i7O2aMAo0LDCCVyHcS_tQmJ7JJ_7eeuwjV625EoyFuY8 sn0MFhkB0zBWYhWu7JgFwq0Y43kbPdTzlhrJHoghrc_93HGlRj0KGDrEtF0IgzIyjx5hg5U29CqU a7g0KEtAjwVSVAXgMBOgkwPkuU4A9IfyDnoaF0ig8xwkFHR5Geuc03M6iVhbbi8KkJ4FQCQBwYmS 5Ac0ac3yIZgpFLC0gBq4xoMbVA.2_gDACkI2vZlkcgz0_K9MU1Ub05h6nYEKFO..YXd8HJUavYcp dpjvpJoX5s6fSc7vgUMPANBGqMRbj_QHI.adaIUOL90EElTSFqr8DVGI58BRdqts4rAZZFYi82iP IorZPhYNpkT0SnTXvHqScVQm8mvn_34MzWEUZxzEZc.sWU1FObvwEngcMqu9lsza3r5Xy21Arf9o pDMKoZ228UQT_rjOC0G.dukCIoa7rfWbF1CnCpgSj9lIEbDtP6otPP5R7xx91raLOb7t2De4oSmk pAyanUZriu6wZYDBuEU4Ye2XmqTKgaGAhFNRs.EyLbenjd1R9uQtgdMq3lLhfcj5PR4WH18aWEzL _tKMkzcwwpBsOxMOlKv63f4mryzi5wedqDQ33DX.E_Qae3tjI9XsC7JloRm79Okz249JSzNnQ48M 3mPNkfFZ6iXJAIMLO9CdaA17X9XZrfe6zk5qcWXsnni2NJyN_RPvQCD0yZt8FUyzXZkuOJfLmbNW 4IuqZNpsaTY14g53kVWDmjw2ANSBn7l1eY54lkvN6TP4zSh9L8CO5Y09zdh8.a4iBBYi_ewqqoLu 0x2IMkBnRxshKt21IudIG6FG32sHX.Rnh77k9PHXee716y8SdamiOM8WuexL_3QhDvnysrz7ksBv N7PFFWovuFA6Tsqbtal9izLcNnb9bdxAfRck_nM9mAx_jibMMmg5F9Thc7DhZyyZ_C0TPphAc6Co GEgO3iop7dIKL8u7eOyLEg6Q85TsFQyja1KORrO2ndrdOrFmdaB.ozSYzbY67kLCdRwR3MENMjIC bn16Jgt22jQSJ8SCXnyUH7Pa9nUCt2E8DviBJfmD4Jflnw8leDiBRNLrsZVgURZsBLVO2t5tvIbD dfks3_s2GVizodrBF4QiaIbgIZiiPzGQrAtnxYzrL.0BNs9YgUK6ryiLFQW.tGoc6udIfAHX1CeD KrdybNYGUs3fmdrGaXmyEcRDd2l6h5oA2jCk8CeOIU1RH4dQEmkHrCDmUBNpoi6D7hJ5xtCJagdJ 503BU_ATUUvScLymVm2jUm1oBnXWq6CISwnpaQXSNdue6VoIoGSFAzZgxYcd4DLd6RcgdSMRftMH odMcQxj08jY82f4cwB50AwO0rMdPeqlQU6NOrwRCKv0zrUGybEbdAKFejdy1kTEFKX71nGvTmTmJ hQSzUYA-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Wed, 27 Jan 2021 08:18:38 +0000 Received: by smtp411.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID bc04903bbc7c90a45d16c558240d66f7; Wed, 27 Jan 2021 08:18:35 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question From: Mark Millard In-Reply-To: <20210127082445.2ff4ca6a@zeta.dino.sk> Date: Wed, 27 Jan 2021 00:18:33 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <20210126231347.0d7c5a77@zeta.dino.sk> <20210127082445.2ff4ca6a@zeta.dino.sk> To: Milan Obuch X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DQc1r0z8Nz3P6D X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.48 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-0.98)[-0.976]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.69.204:from]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.69.204:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.204:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.204:from]; RCVD_COUNT_TWO(0.00)[2]; 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, 27 Jan 2021 08:18:41 -0000 On 2021-Jan-26, at 23:24, Milan Obuch wrote: > On Tue, 26 Jan 2021 15:15:22 -0800, Mark Millard > wrote: >=20 >> . . . >=20 >> By the way, the modern version of Warner's documentation >> is at: >>=20 >> https://github.com/bsdimp/freebsd-git-docs/ >>=20 >> and is the basis for the documentation update FreeBSD >> will have in this area. >>=20 >> In the Cloning and Mirroring section of: >>=20 >> https://github.com/bsdimp/freebsd-git-docs/blob/main/faq.md >>=20 >> there is a little material about issues with using pare repos. >> The Users section basically says that using bare will not be >> documented. (I've never tired to use a bare repo.) >=20 > If well working setup can be achieved this way, things can be = changed... >=20 >>> . . . >>=20 >> The "No staged changed migration" section of: >>=20 >> https://github.com/bsdimp/freebsd-git-docs/blob/main/src-cvt.md >>=20 >> reports on using the following to clone with the ref/notes related >> material included: >>=20 >> git clone -o freebsd --config = remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*' = https://git.freebsd.org/src.git freebsd-src >>=20 >> Note the "-o freebsd" that you did not use. The coning notes >> in: >>=20 >> https://github.com/bsdimp/freebsd-git-docs/blob/main/mini-primer.md >>=20 >> also use the "-o freebsd" (but not the refs/notes related material). >>=20 >=20 > Yes, because git said --bare and --origin are in conflict and can not > be used together. And FreeBSD has set things up for using --origin . Otherwise you are on your own, from what I can tell. The conflict probably (partially?) explains Warner indicating that he will not document use of bare repos: too far from how they intend for folks to work with git. >>> . . . >>=20 >=20 > Thanks for pointing to another material. Something emerged from this > discussion. Glad it was of some help. > I did a bit of digging into config file in git repository now and it > looks like it is possible to get what I want with some editing there. > It should be possible to achieve it via using 'git config' as well, = but > as this is my first attempt... >=20 > I need some time to verify working status or fix issues now. As soon = as > I get feeling it is OK for me I send new mail documenting what I did > and how I use it. Sounds to me like you would get more support sticking to what is normally allowed to be mixed with --origin use. Otherwise you may well be mostly on your own. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Wed Jan 27 20:55:48 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 1AF2D4E9DCE for ; Wed, 27 Jan 2021 20:55:48 +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 4DQwqR5J7lz3N69 for ; Wed, 27 Jan 2021 20:55:47 +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 10RKtgOc070058 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 27 Jan 2021 21:55:42 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Wed, 27 Jan 2021 21:55:42 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Milan Obuch Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: References: <20210126151017.4a9dd711@zeta.dino.sk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20210126151017.4a9dd711@zeta.dino.sk> User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4DQwqR5J7lz3N69 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: Wed, 27 Jan 2021 20:55:48 -0000 On Tue, 2021-01-26 at 15:10:17 +0100, Milan Obuch wrote: >Hi, > >I am working on new workflow setup after svn->git move. I did some >tests, starting with Warner's Hacking Blog at >http://bsdimp.blogspot.com/2020/10/freebsd-git-primer-for-users.html >and trying some suggestion and ideas taken from both this and current >mailing lists. > >After gaining some bits of knowledge I am going to create something >more elaborate... for me. > >What I would like to achieve: > >- use one repository for all branches of interest and as working area > too > >- use separate working directory for each branch and working area > (possibly multiple for multiple projects) > >- track remote repository periodically and update working tree as > needed (immediatelly after repository update or delayed when other > work on a tree is being done at the moment). > >I do not see in this anything special, just the primer mentioned above >handles basically just single working area case, which makes necessary >some switching (via checkout of different branch or somesuch). > >So what I did: > ># git clone --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' --bare https://git.freebsd.org/src.git /mnt/src/.git ># git -C /mnt/src/.git worktree add /mnt/src/main main ># git -C /mnt/src/.git worktree add /mnt/src/13 stable/13 ># git -C /mnt/src/.git worktree add /mnt/src/12 stable/12 ># git -C /mnt/src/.git worktree add /mnt/src/11 stable/11 > >This way I have nice directory structure in /mnt/src, I can use >individual trees for either local null mount (for jails and similar >usage) or remote mount via nfs. > >Look for status: > ># git -C /mnt/src/.git worktree list >/mnt/src (bare) >/mnt/src/11 09bdde595dd [stable/11] >/mnt/src/12 70cdab054c8 [stable/12] >/mnt/src/13 da2dfec8f75 [stable/13] >/mnt/src/main 25cdacf79b0 [main] > >Nice! Clear, easy to understand. With some scripting, this could be >used to create id string for uname use (there is a thread about this on >arch list, this is something I need to think about especially for >remote building with sources mounted over nfs). > >Now for updating, trying to fetch... > ># git -C /mnt/src/.git fetch >From https://git.freebsd.org/src > * branch HEAD -> FETCH_HEAD > >This looks like there is nothing new to fetch at the moment. So waiting >a bit for new commit... waiting a bit more... trying again... > ># git -C /mnt/src/.git fetch >remote: Enumerating objects: 5, done. >remote: Counting objects: 100% (5/5), done. >remote: Compressing objects: 100% (5/5), done. >remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 >Unpacking objects: 100% (5/5), 42.60 KiB | 484.00 KiB/s, done. >From https://git.freebsd.org/src > * branch HEAD -> FETCH_HEAD > >This time there is something new... I need a merge now. > ># git -C /mnt/src/.git merge >fatal: this operation must be run in a work tree No, you don't want to merge. Why would you merge? You want to run `git pull`, that will pull the updates from the remote refs into your local refs. > >I am a bit stuck now. What does it mean 'being in a work tree'? Doing >'cd /mnt/src/main' or similar before git command does not change >anything. I read 'man git-merge' but still no clue. It must be >something simple, I just do not see it. > >Also, > ># git -C /mnt/src/.git log > >does not show new commit yet. If I do 'git pull --ff-only' command >(with another git repository, created exactly the way mentioned in >primer) at the same time, I see new commit in log output. It looks like >log is updated on merge, not fetch, judging from my previous litlle bit >of experience with git, so this maybe should be expected, I just do not >know. No, the log isn't updated on `merge` (probably just sloppy wording), what your log does is show the log of the local ref and you haven't pulled anything into it yet. If you had done git log refs/remotes/freebsd/main (or whatever that is on a bare repo), then you'd have seen the updates. >So the big question - did I the right steps to achieve what I want, >descibed in the beginning of this mail? Is this way OK to use, or >should I use some other way to achieve this? Yep, all looks perfectly fine, except you need to run git pull to bring in remote changes. So usually `git fetch` to update your copy of the remote refs, then `git pull --rebase` to bring in the changes into your local copy of the ref _and_ update the checked out copy. You might have to tweak all that a bit though for the bare repo case with worktrees. hth Uli From owner-freebsd-git@freebsd.org Wed Jan 27 23:29:48 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 AED5F4ED7B9 for ; Wed, 27 Jan 2021 23:29:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic301-22.consmr.mail.gq1.yahoo.com (sonic301-22.consmr.mail.gq1.yahoo.com [98.137.64.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DR0F72pT9z3mMv for ; Wed, 27 Jan 2021 23:29:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611790186; bh=yBZTRngplZsjDyQPuXY/49GrB5WTyd7r6k1SJMShTGk=; h=Subject:From:Date:To:From:Subject:Reply-To; b=a6PF7zWkQxkMNPU6FKHqycLZ0TQyv+ebS/9ItPiSpnkqO3NKPIQQX6XZFzJKAecaRtoaavvGYt98Gb9tSu6zvPKQ5QqHW0scGodwoa0FMKskC5Fa5TjFc5gRw1WWVOLRxCI4FXC+YL4K974u9l4bXTKA1FoqfFwsUygvugHxwMsZ4WFlYUHaQpDYQnRlIr1OJXMUGbEVJtkrR9sqEzM+bCoFY1hSp33yfGihfwNvOFj91IU/OkT2dT3bFvRFwSIvQbP2Djdq7tQvB6xQVx665Ru+RS5WE+oGG2Ms/5xXH3Zurwsn6IpJC8K3ZeqZZzUvqzh6HudsXDFt95Mf1oFF/w== X-YMail-OSG: QR5C85UVM1nYxL6cM8ffmJmsYZXtDqDKvmokaKdnWzWlU52MFIyqpCabQFFYv4T cLE7ZZuO8rMmMeBOwLG7KYvofWER7TNpbnyKGTcaeTW0ataIAFsAy5IKkYwjcBoV.wFYIqskycD4 BbYQGuC7H_SFB2edmKdFF_xjnF9gswmHNE9rHrZVPFe6oHDZqbaVGzyv_9gaAMMicGmMDa3QB7Vs 7oqxsKqZnaeXV9klUJkFBKRu9UlGOusX.3ixhbABihBsJKv5DSFjp7VFTX4bcJzWEjkBTZGOGYmo RSHSa6qynuG9BiYiPv3792rtPubYd5tbNvyOHLxSil8Er.Iam6vm8hVtBZlnHKUTKwMkoV6HGXsB b2Z2.VxeTktZf1nJjR06ziSD6fSMmdF2wVTHYKaNDwx9Oa6txCyo10lM2c2qRxwU3.dQWcNKRuvH k.Vgn2ii4.5YJnVbhal1270pDWCdYryrhFPctnAmU8Q_zQ5KxgoejIcqK5O_zY6e4tmkwWvhR0XE l9Etw0HsfEmZIuzk5kNRIHfcZDG_CiOI0ddlAvgvTTxYxYMLKv2HFBbVuMKmPLaPk.t0EcIwQ5Kb HZt_9uerxs1TXaQuLF_353AECELhpXnHTaq5Sc7UcVbicAaTauY5wnTpCTEmkV._DzjM2UpgGx7v SM7jNWPP6_nGex.rnvu6CVmaIAfUWxY8mmC9OyaIFWoUsbpWB5l6KoQRv0ZMYD9N.0c2dGe3VCam Tuf0U1yq7taI107ltu43sqhpbN3z.le4iwtROxnSNwsKR28AJjqxuCOCWfqH74TXXyPpIESw9NFh kh1nmeLNPPL9TbuXLe1V734Hq77Mqv5t1_Fh08W4I1VRgn56a43oCRWu84Zvl6G4eypE.hkatxdk AvFf2ZaBWWWVfWvEuUsniY.AUm4pt4WLOzgx8XLaEtDiPnuh3wzjlFzDvdN5edKTyTQQyg0lCVQk qbUfedk1iJ9LW2yTj_cmdNDo8ojZ.rBGYMciqN.ZVrmh4m7lyon31cBuHdk.tH092VwHBelp9Gsc AIVI7eU15PYDdn81Hu4BTqkjdMfw6gbVG6I8AWOHQijIqRc4Igv.oaChwu5QPK6ixQ3AO.Y_8HKP IoyxEVIUNiRYtP_5wWlKG_KfS9ktu0MI32HsjIjimDThBnsndSorrG5p0PL9noHpN3XyhHLd5m0S Z_Lnq_9M6Id6n9M1LwfqZiZ5YZccCwOcg5VIW4H9T2_LQH.KwqVsrhWQ3V6JK4EM69zHxLZAvFon lt0wevuiOOk6OGyITjMgJac4SKquQ1m4urnM207yHDUmqpkuc6NexY9wi5Ht5ZEigfAapo0vwE6t ynrQpm89T3H9_Owju7z9BogkJ8ZEbifcaEkns57WsTSCR_EXPVmIkNUPu3ccn6FtfQmkcfFYFkFq wXgtlA0ZnWRLvYlV9of2_Y.ME2kiMQfbjIWDghD89ssY2Ipazlklr9YmzsW_8mMjh2ndj43TX2Xl Shf_l3tkq.xkVnLV_.3LrJeEhNmdXq5PIWYz6jP8O2qvH62._HwISmvflmd__qPk.X46.MdbI_jD FTnmNh3nuSOYdfkofU6EfgD3y0v8MnjUclDvIfGMfaDdN4yL3tPBtbNqPERKrk_uqb36ykd3S1Ml RrepWTSXEI7zHi0knqmVwPWQnC6iEZUJT8o4a0jb32LDN2sJftKdJ4_CPMHa7DRYCjZlw2hFm6Nx LZojDYF_We0PhtLtl.XHcDzsgz_X98SzQ2ChDc72BbmOEc9xaN6EYGkfk2tUCv9A_vKt9qXfoM2s EoglVk2be6J6.CPEqRQf6Goa4jgEZGqBy2z0tM913ZgWvFKixhN1_L7YkCYLoZNs1W0SZNTUUa_i XNMdMSqKUkOl_rYeufXPtbiw1XuHeIvLceNdBnYgvOZdRC7nxK3A1KnNnSI3RXxWYswihhjRtmPE rOOBh5Nl6SHigIDcKA6iZBgTo2NnCfTyY8GLbx3pJadCAEtZ3LmERh02G3dPBHQynRWzXz_PVnWE gUbhodrH9zLACritB.KE5Kg4zOvPDFcTH4BeqyzAH2f.Rvzd4AWH69L.1M4KmJjVGe5NJVGkwYJ9 nVOpzbKZMJzJs9Wydt2N.9LJG7POa6GemlwyxTtdOftCr7XQhxMwaRqTTkCWCFj5Xf.MoKf_LbtX v5VUaKkbWZYTV6xCepbGtytZGMzajm2kRNZH3YgRpUEQhk95vuQ0TCGDxiEQeIIHaTnaMneDQdfR vDIJG4djZxo16TCF0qt58VXy1pLRW9uliZi5eWvO8JHTMq.9kymfB2JwBTeNOmld6w75uiWx8UgB 8eYDkS4X9XdeSqxPprUejpBsI_D34Cz0ZWOQml.VbCmWNdh2B9GRsydbnj8xIIqb_2NmB.4.nqX4 8Q.J9SfBV2A88CTvduQJ.WgOpQPgiJUf6CcrC1X1O4o0gD3gw6hWaj8iw6fNghtqs6.e5hy1WCrb 2l.V1AvDIbEFFE1NSs2l1m.8a7bwpy34tNit81nrpJfZaYMWcIG3YBR_wnkqCznjDNk4cUJY- Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.gq1.yahoo.com with HTTP; Wed, 27 Jan 2021 23:29:46 +0000 Received: by smtp404.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 63bd2303a8cd779a5976e508ec9072a9; Wed, 27 Jan 2021 23:29:40 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question From: Mark Millard In-Reply-To: Date: Wed, 27 Jan 2021 15:29:38 -0800 Cc: Milan Obuch , freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> References: <20210126151017.4a9dd711@zeta.dino.sk> To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DR0F72pT9z3mMv X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.64.148:from]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.64.148:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.64.148:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.64.148:from]; RCVD_COUNT_TWO(0.00)[2]; 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, 27 Jan 2021 23:29:48 -0000 On 2021-Jan-27, at 12:55, Ulrich Sp=C3=B6rlein = wrote: > On Tue, 2021-01-26 at 15:10:17 +0100, Milan Obuch wrote: >> . . . >> # git -C /mnt/src/.git fetch >> remote: Enumerating objects: 5, done. >> remote: Counting objects: 100% (5/5), done. >> remote: Compressing objects: 100% (5/5), done. >> remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 >> Unpacking objects: 100% (5/5), 42.60 KiB | 484.00 KiB/s, done. >> =46rom https://git.freebsd.org/src >> * branch HEAD -> FETCH_HEAD >>=20 >> This time there is something new... I need a merge now. >>=20 >> # git -C /mnt/src/.git merge >> fatal: this operation must be run in a work tree >=20 > No, you don't want to merge. Why would you merge? You want to run `git = pull`, that will pull the updates from the remote refs into your local = refs. QUOTE from https://git-scm.com/docs/git-pull : git pull is shorthand for git fetch followed by git merge FETCH_HEAD END QUOTE (other wording for the likes of --rebase not quoted) Looks to me like he tried to do something like what git pull does, but in two explicit, separate steps: git fetch and git merge . >>=20 >> I am a bit stuck now. What does it mean 'being in a work tree'? Doing >> 'cd /mnt/src/main' or similar before git command does not change >> anything. I read 'man git-merge' but still no clue. It must be >> something simple, I just do not see it. >>=20 >> Also, >>=20 >> # git -C /mnt/src/.git log >>=20 >> does not show new commit yet. If I do 'git pull --ff-only' command >> (with another git repository, created exactly the way mentioned in >> primer) at the same time, I see new commit in log output. It looks = like >> log is updated on merge, not fetch, judging from my previous litlle = bit >> of experience with git, so this maybe should be expected, I just do = not >> know. >=20 > No, the log isn't updated on `merge` (probably just sloppy wording), = what your log does is show the log of the local ref and you haven't = pulled anything into it yet. If you had done git log = refs/remotes/freebsd/main (or whatever that is on a bare repo), then = you'd have seen the updates. He did both the git fetch and a git merge (but not a fast forward merge). But he had cloned with --bare and: QUOTE from https://git-scm.com/docs/git-clone : --bare . . . Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to refs/remotes/origin/ . When this option is used, neither remote-tracking branches nor the related configuration variables are created. END QUOTE So things seem to be odd compared to the normal expected type of configuration for FreeBSD. >> So the big question - did I the right steps to achieve what I want, >> descibed in the beginning of this mail? Is this way OK to use, or >> should I use some other way to achieve this? >=20 > Yep, all looks perfectly fine, except you need to run git pull to = bring in remote changes. So usually `git fetch` to update your copy of = the remote refs, then `git pull --rebase` to bring in the changes into = your local copy of the ref _and_ update the checked out copy. >=20 > You might have to tweak all that a bit though for the bare repo case = with worktrees. >=20 It looks to me like he is using a configuration (--bare) outside the range FreeBSD is intending to deal with and so he needs his own fairly-unique procedures for using git for FreeBSD activity. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Thu Jan 28 00:16: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 CDE054EED22 for ; Thu, 28 Jan 2021 00:16:26 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (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 4DR1Gy43Rsz3q3T for ; Thu, 28 Jan 2021 00:16:26 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 10S0GFxa046555; Thu, 28 Jan 2021 00:16:15 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 10S0GDLr046554; Wed, 27 Jan 2021 16:16:13 -0800 (PST) (envelope-from david) Date: Wed, 27 Jan 2021 16:16:13 -0800 From: David Wolfskill To: Mark Millard Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: Reply-To: freebsd-git@freebsd.org References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="3B/WTDX4IHYYXoLn" Content-Disposition: inline In-Reply-To: <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> X-Rspamd-Queue-Id: 4DR1Gy43Rsz3q3T X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 28 Jan 2021 00:16:26 -0000 --3B/WTDX4IHYYXoLn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 27, 2021 at 03:29:38PM -0800, Mark Millard via freebsd-git wrot= e: > ...=20 > It looks to me like he is using a configuration (--bare) > outside the range FreeBSD is intending to deal with and > so he needs his own fairly-unique procedures for using > git for FreeBSD activity. > .... I do not claim to be especially knowledgable about git. That said, what I set up for my use does involve a "--bare" (more precisely, a "--mirror") repo. I documented what I did at https://www.catwhisker.org/~david/FreeBSD/repo-sync.html Please be aware that I did not make any attempt (for example) to minimize disk usage: just for FreeBSD sources, I have the mirror repo, and I have a completely separate "normal" working copy for each branch of FreeBSD that I track (at the moment, head, stable/12, and stable/13). I am also not a "developer," per se: I have no need to ever think about trying to commit changes and push them or upstream them. As (briefly) mentioned in the above-cited Web page, I made an attempt at using git worktrees, found it confusing, and gave up. What I am doing seems to be working OK for my use and requirements. My requirements probably do not match most other folks' requirements. That said, there may be something useful there: For the branches I track, I track them daily on a couple of different machines; one of those is the laptop I use for normal, day-to-day work. Peace, david --=20 David H. Wolfskill david@catwhisker.org Some follks seem determined to drag the Republican party down from a role as the "loyal opposition" to a mob of Q-Anon-crazy insurrectionists. See https://www.catwhisker.org/~david/publickey.gpg for my public key. --3B/WTDX4IHYYXoLn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmASAk1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PckRpwf7Bvor6peTV+7v0MFGLq/2toeLJCzNIq0Cz5uViMTIws8fadd823mutTho foz23nYeBcfqnmUUJuTcIfc2dQXhhAHSwtK0xpWEUoUC4NPhSPb9y/U6TVhnQCcr kkmqkgDg5gy+nQbat4Q7GX+fJC39y+5wGJzlfP/URiMDD3yWwRtihr8UkRQvpOD1 Ua4FtvMvKo9yVNyyLoljV99uhjrGUSkcxcyl60+s/a2J7ttWVsJIbLaslg6fQu3G FZ4EMf5cq/SUG2Kd4zl5fEy5EYv/Ce8iSEBnDxZjdZyjA/BBW9s0gxcKJrRnd2pX IP2imiuqTFTxxknR1XifScw/XfYtyw== =HXgg -----END PGP SIGNATURE----- --3B/WTDX4IHYYXoLn-- From owner-freebsd-git@freebsd.org Thu Jan 28 06:33:28 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 162D44F9ABD for ; Thu, 28 Jan 2021 06:33:28 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from mailhost.netlabit.sk (mailhost.netlabit.sk [84.245.65.72]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DR9dz69vKz4gVh; Thu, 28 Jan 2021 06:33:27 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from zeta.dino.sk (fw3.dino.sk [84.245.95.254]) (AUTH: LOGIN milan) by mailhost.netlabit.sk with ESMTPA; Thu, 28 Jan 2021 07:33:17 +0100 id 003E8C74.60125AAD.00016050 Date: Thu, 28 Jan 2021 07:33:15 +0100 From: Milan Obuch To: Mark Millard Cc: Ulrich =?UTF-8?B?U3DDtnJsZWlu?= , freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: <20210128073315.44377b29@zeta.dino.sk> In-Reply-To: <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i386-portbld-freebsd11.4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4DR9dz69vKz4gVh X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 28 Jan 2021 06:33:28 -0000 On Wed, 27 Jan 2021 15:29:38 -0800, Mark Millard wrote: > On 2021-Jan-27, at 12:55, Ulrich Sp=C3=B6rlein wrote: >=20 > > On Tue, 2021-01-26 at 15:10:17 +0100, Milan Obuch wrote: =20 > >> . . . > >> # git -C /mnt/src/.git fetch > >> remote: Enumerating objects: 5, done. > >> remote: Counting objects: 100% (5/5), done. > >> remote: Compressing objects: 100% (5/5), done. > >> remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0 > >> Unpacking objects: 100% (5/5), 42.60 KiB | 484.00 KiB/s, done. > >> From https://git.freebsd.org/src > >> * branch HEAD -> FETCH_HEAD > >>=20 > >> This time there is something new... I need a merge now. > >>=20 > >> # git -C /mnt/src/.git merge > >> fatal: this operation must be run in a work tree =20 > >=20 > > No, you don't want to merge. Why would you merge? You want to run > > `git pull`, that will pull the updates from the remote refs into > > your local refs. =20 >=20 > QUOTE from https://git-scm.com/docs/git-pull : > git pull is shorthand for git fetch followed by git merge FETCH_HEAD > END QUOTE (other wording for the likes of --rebase not quoted) >=20 > Looks to me like he tried to do something like what > git pull does, but in two explicit, separate steps: > git fetch and git merge. > Exactly. And the behaviour is also verified - for one worktree, what does git pull is exactly the same as git fetch followed by git merge. I have currently three repository copies with various setup and various steps used to create them, but what I do (pull vs. fetch + merge) is consistently the same, when done at the same time. > >> I am a bit stuck now. What does it mean 'being in a work tree'? > >> Doing 'cd /mnt/src/main' or similar before git command does not > >> change anything. I read 'man git-merge' but still no clue. It must > >> be something simple, I just do not see it. > >>=20 > >> Also, > >>=20 > >> # git -C /mnt/src/.git log > >>=20 > >> does not show new commit yet. If I do 'git pull --ff-only' command > >> (with another git repository, created exactly the way mentioned in > >> primer) at the same time, I see new commit in log output. It looks > >> like log is updated on merge, not fetch, judging from my previous > >> litlle bit of experience with git, so this maybe should be > >> expected, I just do not know. =20 > >=20 > > No, the log isn't updated on `merge` (probably just sloppy > > wording), what your log does is show the log of the local ref and > > you haven't pulled anything into it yet. If you had done git log > > refs/remotes/freebsd/main (or whatever that is on a bare repo), > > then you'd have seen the updates. =20 >=20 > He did both the git fetch and a git merge (but not a fast forward > merge). Again, exactly. Re: fast forward merge - from --ff option description in git-merge it looks to me it is actually not important if I am following branch with no other actions on it, i. e. with no local changes. At least it works this way according to my (gained up to now, still relatively limited) experience. > But he had cloned with --bare and: >=20 > QUOTE from https://git-scm.com/docs/git-clone : > --bare > . . . Also the branch heads at the remote are copied directly to > corresponding local branch heads, without mapping them to > refs/remotes/origin/ . When this option is used, neither > remote-tracking branches nor the related configuration variables > are created. > END QUOTE >=20 > So things seem to be odd compared to the normal expected > type of configuration for FreeBSD. With some tweaks, things are perfectly working now, for me everything is perfectly logical. Actually I would describe it as expected for using multiple worktrees, not vasting space (keeping multiple full repositories) and time (updating multiple repositories). > >> So the big question - did I the right steps to achieve what I want, > >> descibed in the beginning of this mail? Is this way OK to use, or > >> should I use some other way to achieve this? =20 > >=20 > > Yep, all looks perfectly fine, except you need to run git pull to > > bring in remote changes. So usually `git fetch` to update your copy > > of the remote refs, then `git pull --rebase` to bring in the > > changes into your local copy of the ref _and_ update the checked > > out copy. > >=20 > > You might have to tweak all that a bit though for the bare repo > > case with worktrees.=20 >=20 > It looks to me like he is using a configuration (--bare) > outside the range FreeBSD is intending to deal with and > so he needs his own fairly-unique procedures for using > git for FreeBSD activity. > I think exactly the opposite - the way I did it looks (at least to me) as a natural way extending simple case described in Warner's Git Primer if one desires to track multiple branches for whatever reason. I am still fine tuning my setup and gaining more experiences with git, but in my oppinion (and others as well, I found some articles mentioning exactly the same) worktrees are really powerfull tool for a developer, which, when used with some thinking and carefully, could make one's development much easier. I plan to document my setup soon with simple steps to re-create it and some explanations as well. I do not still understand everything in detail, but what I tried makes me confident I can use git this way effectively. Regards, Milan From owner-freebsd-git@freebsd.org Thu Jan 28 09:44:55 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 B97E24FDDDA for ; Thu, 28 Jan 2021 09:44:55 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic302-21.consmr.mail.gq1.yahoo.com (sonic302-21.consmr.mail.gq1.yahoo.com [98.137.68.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRFtv3QQxz4rnx for ; Thu, 28 Jan 2021 09:44:54 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611827093; bh=rLtBUeBCTvX2ZNyJcuc/1mH1q999Tf/f+NCW/80XHK1=; h=Subject:From:Date:To:From:Subject:Reply-To; b=jNImVqhqeQY+NFknJqXyeC4MVOJudilPmXM2Y5HvCsdN2R9GQm0y1PzyyM0S4UZkHOHUQGY+lPSLrcENK6weOX8ISMIaYECTwFw6rchqC+S1NL2aylPM82gynT56f0uXt0ssBMlXfzdgt+09wg+E6LBU8flIOk+h8rMH61tWBUS2QllPGDQF/PF3gTk7ARjokCcUK+S+3HqBkt7CcqoweiKOg4KOXR7uKBmQoRc71xFHcSAXXalOAv1MyclmZzCOOiXq48t0Y2UTJuwbZLnH6rSq2H2Irz8gAE582DUltAOgH/LX/h4EyCBOEAgchXS/d/UnQznoPIqnZAic825aKQ== X-YMail-OSG: yM5ofiAVM1mZiAZdAJm9eG1Hq_.gPO7Bu6D3fGT3ST1gPowYLTRfkpA1ODHRIRt iQxhdnjMjKYsWqlBhbYZuzAHyJ3A9Ei8Mf.oX1nzVqFh737d8G1PjNvq8klh0xyBm1Wg_ZEQl1yf zr3UwHx5iOIyV4VAqyjFwdU4aHlqDwKvtOi7vhb8qPzaibhiSwc7IZVH5dkNcY5PUcCi2wqFCMCh JdOxvzTv.oy9KxeQxBhAI8D2Lkk1cj0UcjD.WWIF8A129hzc4iIAHPFa2xzxQUfTIW2i9P.wjLCv TuEIELWH.4UdRw.Ikuj1IqM5HWZhhGFUrxPInk223KLvARfQrCaOCzTebr9HPoWU68UX0IB6mt0W Inmh0afwfnqP6o8QQxCqZd5WW6L2Dub1zOF9AzyoOaGJExEuK_RoMNNEgZJ53N_wHYjxX3zT9etB utRh0LG3z2Ecm9hm1Ry7NU4kwJGepmOrgcyCT9ds.rrWYkiWkMkMg3IZ7DVcvuFdiHpUprz9l8oZ 4gwM0dV1ra5P9CdsgNYeYknaJABl0F0umNWIltUkboVufK8SR38L1pV85MF5YYuUdNcq_E5.5kWC htmT4OXnyqURD7OGfuktyuUrz9Pij2_QuLG7fYsvEsieclpQAlX1RNaD3DzHbRxvtRdWPJTnBSGh KElpW1i6FZk7gy30aqbd8IGR2YsygWRoaOCX3alGogsT0Onrd6vMlxkWfPE.g8aCPyTVZzJXHY25 AbkT4U1mZrKBE39eMI55Mo5LWOoMLj.Vg.UoUqfUqgr22pyi3cYbfGTwU8s65QAMrxOtJakDJIZ8 BmlXXxwkq9J7z4y5mqFTjRDx2Dv1pcylBeq3hYNHPdOnHcu1I0flcVpwW_jUfoDrGIcEUYfCdjTO Cbdv.SlgO_3obEKEYm0vgS7Zv0.u31O1OqHBuzA_c3sbe593xcMbnwnfH9yKQ0zI6E8na4YO10Iq h0r9zTT3mAUZWh7Ga3mQEJhieigtWhJU4I0j4FR1bu9nZk8yIvtaFUEHpyQxDaHzgOMm4srqM9jy puDbzqUAKBrWnFW9HkOOVQp0Cy35EVbAWDlVJsBNwxiB1vVsxyZkVnfM6w3.uSlZQT9S2sMWUQzn pwWoir_YD1bEj.92TV7s30cu7pWudCd2WnC2N2CV42AvbGmG8Ytx_buRU7fg9AmS1_GIpk2Xjugi .IMbzs_ym3QTDAKFUJl0U15kFjlEO1UpTfoW3rGkZPQvsSvGOyIVGgmp0pCVODTSRDRSlxU5dNKE 5mBwtlWpSDkKkRvqZx5zoM2biDAecpi3LW2JJshcwuWBEhefT7WHFJzrHpAEHPa7qyVK0WsnqhmC 0MluQWKHw6jl1TLBIhecaq0gO6GDI54AuZug7GM4ZvMDfZJChkbu8KYkz6F5Rprq7ElGQNRMyYYG b93omUJuPPHuLBRVmFAYV3_UGhRVlGZhMtF1BL8in6qwTub0JjUZowVoZ3mNnee.xJ4zxyzd.tou sLsVg5nf5rRG34Z0xe9TAo.my3x4AoN3u2P5l8h5ORPPqwNhlma7IdlGpreQ7We9Xg36SO3ESd8M tygxAYl.O_6vMDK3bzkw1lXCIGvUJP_Wvqk8n3jRPB5_QHk1K7Y2x.aoSF8f6yAD4AdFUAUfX7J8 B1vaUqIhbLvQZRMiILzqdc41NYPrL2RcLqWQpsCR3sTwRPTSjMdL8VhNR.vFVFlebie3ZV7JKxEO tn717kYRzlUENz9LRwxBAW4ty6DLx_YnWmLOfce1Jnm4ERlpI.hUpsSGTUG..Pd41Nx0xUZNWSWK UzorF8oWjW2b09Zf5PQemaCyWxmchrC0LVtc5Otg7iSr_QmOOSqb8NDn6x_XCRJu8MWxzaqHH917 G6AR1gEw8u.UW0sO.AQy9BoZNUyiS6FDNknXf5NK87Zwj0CD_.gqh6pTHw60wUk50q_gADZpaRgv lILs0EhD.4tzeTe.YcQdAXkKT82dcYbxisVeRbUY7xonlAklqMhpSWMY1VVnsagBo0yYa8Z_usIm xoVlUhCHubjyIVliFCCsQiCIOsm_UiunbvOfwkFBIYGxjwfx4wTxIgHgZpJNthSVuGypnaufBeVF VCf8meGLumuDacksQ3xk5Y4yx5OUfKXvnnkqvwK1zh4IICGzrarB3ze4IwhHLby0N2HmojdWjSfW QBkheLOUsuHttdu3Unz6OyaL6yxI74HtfZp0FlOArbVUsOBsTU1DwoekBpUXZlbPERYlerbpzhhk 3KNhSfyIAl_s91Y9VAvRSPqKXOfvfb7Ft2rbl5dgOzI18s4PLFQ4NVt2sy_T4rgOeiqGK7uiqahV oZiTAcKE0G7wBxVgYqGNXHVQI07SPYWOtyHXb5ff1DgHdeAiiLRAiN7ewAf_0mcPCgxgaeI2vyMW fvtUclYfVKoqtoYi8G8lZ_PI_a1yP8JbXOuSCK.XYvkNJOHqEI2FSOyaBDvMFIhJooeKT9ztRbo6 HBzNjgkfwwFuH6adUcL9dZ_73 Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.gq1.yahoo.com with HTTP; Thu, 28 Jan 2021 09:44:53 +0000 Received: by smtp417.mail.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 4f5665988ede466a590f65d291ccebed; Thu, 28 Jan 2021 09:44:50 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question From: Mark Millard In-Reply-To: <20210128073315.44377b29@zeta.dino.sk> Date: Thu, 28 Jan 2021 01:44:48 -0800 Cc: freebsd-git Content-Transfer-Encoding: 7bit Message-Id: <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> <20210128073315.44377b29@zeta.dino.sk> To: Milan Obuch X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DRFtv3QQxz4rnx X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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, 28 Jan 2021 09:44:55 -0000 On 2021-Jan-27, at 22:33, Milan Obuch wrote: >> . . . > > With some tweaks, things are perfectly working now, for me everything > is perfectly logical. Actually I would describe it as expected for > using multiple worktrees, not vasting space (keeping multiple full > repositories) and time (updating multiple repositories). FYI: I have only one .git/ and multiple worktrees, but I did not use --bare . One worktree is the (implicit) primary one in the directory that contains the only .git/ . The other worktrees I added after the initial clone. In other words, I did what Warner suggested and documents for that aspect, although using my own naming conventions. I never use the same branch in more than one worktree. All the worktrees automatically find the .git/ . And from the .git/ materials git can also find the worktrees for the branches that have such. I do fetch and the --ff merge separately. I use the --ff style so that if at some point it can not do a fast-forward it will report that and not do something else. Without the --ff , if such a mess-up happens, then it will instead do something else. In other words: I have it validate the expected type of context actually exists. (Paranoia coverage.) >>>> . . . >> >> It looks to me like he is using a configuration (--bare) >> outside the range FreeBSD is intending to deal with and >> so he needs his own fairly-unique procedures for using >> git for FreeBSD activity. > > > I think exactly the opposite - the way I did it looks (at least to me) > as a natural way extending simple case described in Warner's Git Primer > if one desires to track multiple branches for whatever reason. FYI: Warner documented using worktrees without using --bare for the FreeBSD git context and stated that he would not document --bare use. I tried what he documented and it worked just fine for my use. > I am still fine tuning my setup and gaining more experiences with git, > but in my oppinion (and others as well, I found some articles > mentioning exactly the same) worktrees are really powerfull tool for a > developer, which, when used with some thinking and carefully, could > make one's development much easier. I am using worktrees. But I am not using --bare . So far as I know, any differences are tied to that distinction. > I plan to document my setup soon with simple steps to re-create it and > some explanations as well. I do not still understand everything in > detail, but what I tried makes me confident I can use git this way > effectively. > Cool. Sounds like you and David W. may be providing some support for folks that want to use --bare (examples of a couple of ways of using git with --bare for FreeBSD). === Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Thu Jan 28 10:09:03 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 5A6C54FEAD6 for ; Thu, 28 Jan 2021 10:09:03 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from mailhost.netlabit.sk (mailhost.netlabit.sk [84.245.65.72]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRGQk2CXmz4sm9 for ; Thu, 28 Jan 2021 10:09:01 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from zeta.dino.sk (fw3.dino.sk [84.245.95.254]) (AUTH: LOGIN milan) by mailhost.netlabit.sk with ESMTPA; Thu, 28 Jan 2021 11:08:59 +0100 id 00F577D9.60128D3B.00017A5D Date: Thu, 28 Jan 2021 11:08:57 +0100 From: Milan Obuch To: Mark Millard Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: <20210128110857.0ff1db28@zeta.dino.sk> In-Reply-To: <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> <20210128073315.44377b29@zeta.dino.sk> <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i386-portbld-freebsd11.4) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DRGQk2CXmz4sm9 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd-git@dino.sk designates 84.245.65.72 as permitted sender) smtp.mailfrom=freebsd-git@dino.sk X-Spamd-Result: default: False [-3.30 / 15.00]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dino.sk]; RBL_DBL_DONT_QUERY_IPS(0.00)[84.245.65.72:from]; SPAMHAUS_ZRD(0.00)[84.245.65.72:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEMAIL_TO(0.00)[yahoo.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:5578, ipnet:84.245.64.0/18, country:SK]; RCVD_COUNT_TWO(0.00)[2]; 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: Thu, 28 Jan 2021 10:09:03 -0000 On Thu, 28 Jan 2021 01:44:48 -0800, Mark Millard wrote: > On 2021-Jan-27, at 22:33, Milan Obuch wrote: > > >> . . . > > > > With some tweaks, things are perfectly working now, for me > > everything is perfectly logical. Actually I would describe it as > > expected for using multiple worktrees, not vasting space (keeping > > multiple full repositories) and time (updating multiple > > repositories). > > FYI: I have only one .git/ and multiple worktrees, but I did not > use --bare . One worktree is the (implicit) primary one in the > directory that contains the only .git/ . The other worktrees I > added after the initial clone. > ... so currently we are using basically the same setup, I just have no implicit worktree, I created main worktree explicitly. Functionally it is totally equivalent, just with small, cosmetic, difference I can place my main worktree anywhere in file system. > In other words, I did what Warner suggested and documents > for that aspect, although using my own naming conventions. > > I never use the same branch in more than one worktree. > All the worktrees automatically find the .git/ . And > from the .git/ materials git can also find the > worktrees for the branches that have such. > I saw an article on this subject suggesting basically you can work on more unrelated things in parallel. Think of developing new feature in one worktree and creating another worktree for working on quick fix needed for coping with some catastrophic failure, which must be done asap. You need not to think how you should save your work, just switch into relevant worktree and do it. I see another usefull case - working on a feature, which requires for some reason worktree remaining unchanged for some extended period of time. I can still follow development in another worktree for the same branch without disturbing work done elsewhere. Worktrees are basically independent on each other. > I do fetch and the --ff merge separately. I use the --ff > style so that if at some point it can not do a fast-forward > it will report that and not do something else. Without the > --ff , if such a mess-up happens, then it will instead do > something else. In other words: I have it validate the > expected type of context actually exists. (Paranoia > coverage.) > We do not disagree here. Actually git-merge man page tells --ff is the default, --no-ff being used in some special case. I could be wrong, but to me it looks mentioned special case does not occur when tracking stable branch. If, however, something bad happens, I can still throw away damaged worktree and create new one from scratch. > >> It looks to me like he is using a configuration (--bare) > >> outside the range FreeBSD is intending to deal with and > >> so he needs his own fairly-unique procedures for using > >> git for FreeBSD activity. > > > > > > I think exactly the opposite - the way I did it looks (at least to > > me) as a natural way extending simple case described in Warner's > > Git Primer if one desires to track multiple branches for whatever > > reason. > > FYI: Warner documented using worktrees without using --bare > for the FreeBSD git context and stated that he would not > document --bare use. I tried what he documented and it > worked just fine for my use. > As far as I tested for now, the only difference between standard and --bare usage is no implicit repository and (main) worktree linkage. There may be something else there not discovered yet, but my ongoing testing seems to confirm this is actually the case. > > I am still fine tuning my setup and gaining more experiences with > > git, but in my oppinion (and others as well, I found some articles > > mentioning exactly the same) worktrees are really powerfull tool > > for a developer, which, when used with some thinking and carefully, > > could make one's development much easier. > > I am using worktrees. But I am not using --bare . So far as > I know, any differences are tied to that distinction. > > > I plan to document my setup soon with simple steps to re-create it > > and some explanations as well. I do not still understand everything > > in detail, but what I tried makes me confident I can use git this > > way effectively. > > > > Cool. Sounds like you and David W. may be providing some > support for folks that want to use --bare (examples of > a couple of ways of using git with --bare for FreeBSD). > If anybody would like to try something and think they could use my help, just ask. I am far from git expert, but as I was forced to use git now, I found it actually be easy to use and logically built. I am not happy with dependencies required by our git port, or, more exactly, with number of dependencies (some time in past this stopped me from trying when I saw all the ports required to use git). I'd like to keep port count minimal, but sometimes it just does not work this way. That's all for now. Back to some work... Regards, Milan From owner-freebsd-git@freebsd.org Thu Jan 28 10:29:00 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 165F94FF2AA for ; Thu, 28 Jan 2021 10:29:00 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-19.consmr.mail.gq1.yahoo.com (sonic306-19.consmr.mail.gq1.yahoo.com [98.137.68.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRGsl1RPmz4v29 for ; Thu, 28 Jan 2021 10:28:58 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1611829737; bh=1STgcyN1OJOnbtJA+YCLa4hNt907916Z53Nynv558Le=; h=Subject:From:Date:To:From:Subject:Reply-To; b=S6ssl4g1p0j3hBSOrad0G3WXO/ZuUAU1nalXafPl2IYGsEUNuRzSuG253LV24tj1wQok+HN2pk2og756G1kesaopvTKKqTEMkFxim/v7MAQSQFLofGtkSpz7kA18GrL7CbbYPEA/8vok9m93FboZqPiGCKRx4f3nFR27oTYXkOXs+1MMBtU66OegSGtdJQPa2pnGgjXxYjkEPyBpsr/CDtgkrFpuvl1O2l2d4rPifTx/y1Csqz0tIU4YXrq81uXRRvAAmIE+NyutWILyTvIP+rQ3AHtUt8k6WBihr+6w9myr0/pHyaZgDBMh6gG7jB9E92rbGhRGNrIt2Uw4HL9Oqw== X-YMail-OSG: 2Q4TaGIVM1mOI1f1d5UVqbOsXQyp5JlHrijw0YkDLI1YWiZHWSwIjiYnEg5gwlI qymCKdc9yYR.Cbi.ow7BGgRZys5n8zjkxshw5RHyiNKXGizLPE795eNp06f3iCInepOu6QUHOK8r U1FPcOtnB8dtso875V.oc1hAEQvj63JsGIENobd.ujvXfxYiNnlJTVHiwA0_2cTTJdh.ZOylJ4L9 pLunG_wmPyaIaYtsTEn23PvLF2deVnXUU.gj8LFGVqKjSCl8Vr8Pv6qbaFTMFbaM4s9ytFqMy38l dHF2NKfU_DB_jOyWfF7_0E5DoVUaPgIdB.xZeXzp8OnE4lR54SAJmwSzgveJ9EovsrOLgB4opKYq .gd.18o_IcCCVkbstDuUmtmfZsqCeBUPmSQSz.mVbZaT_rufFonLyktXT2m_EJr8z.Sa9IDzb6Mv aZME3Jem5QeKvNFl5LscE_TlSgjdvmLBezo587ShQsvzMtM2as5A.RPZdw6WsMaYSsUMtmOx6AFI y3.qi_ok2_6H2CIHVnBVdJzN7bMTFVxzUcgIwBoovb1nOVmrDC3VNwFrgRdhx6CM6mrrtXhD9jef CWk9LqDReKofS8Nol.WSf4v5qccfnx7eZ5ypZ.naGi186oOFquH9klv8w3yqhfyJYdVI7t_KgXo4 _UQmvPxFe66dchdUXDBjp5wimyHNqNJ_hltbCgWTvlUz3p3zJOS9EHuhPmv9VDDbcyoNkO4W.Yqz wsz2FSxqOIb_UPmi9ZnywPvqgftuwIrCq7dVyGXW8o0hOEOOvAKpKD5Cv3CS51hVsjhv5rKzISwU KzX8G.Nrj81Qk.YQaBmH0DpLxMAtBoLHo5OtCTqTdGGoeQ8dZ9.mXFxbxVF20i5oHrYYBI51PeMR sCUdcFYt2GthKK50LRmsV0bFZXsTi_3dZCjqwNO_CbIcbDycuoqxtIZ3h1USYL4qXvWUz9u7k17q Eh9yNtr_46Wthi747M.hPBovxnrRSiFf8SRMTNGXDsUZYLrWPwxd7.eywp67KqZUOyB9A0GcN1cg Hs2V26JKqhjQ1POk1XcIsRfqkhIe3tBgFhraTe6M20fqg_r4peGQvhzzSaKup1Wn4yPcZxoR_ozG r2OPCufgFK7gZsC3X.9UkfTAVHyAKbYHA9O3EdXAj6PuSLn5D5L7LCfdXaNc29Y6r976ffln..MM yYAIFs_u7OF8jfsDEyx3KON9JOQ2I.KXtSpfgbyb3FFqIrBRiLKA05ilvE9o2zWvJlnO_0aDIqku S30Vsh8MI5OHnvuszs9IR.96_gg9T8WneXW4bJuRV1RJaH9fskWF8Vu.ERSCEO9F80ggNWhP8WQs BZXV_MRTTLUFcgRU4IPb72M3bqfuUsib.UkVh3iawPN3CrxFYk9FRh8HUZ3nKjcw3qcMlFjrsrI4 kx8dH8jszqkLGUzpYxjsOmoGlamSYpWrklwnO7zws1DWeAMDyUj134Afg4LNukSmY7d0lSeHvhQt rt0a6.ZPT8MTWl90u_TtwvRq0xFtANZEuc13JUlZ1IrBnRJLcO9YT45C9wlCGGgAUZjxM2.43Kzb Icguq2P9b25o0NJ1OZt6oCdt6j_cYRcTrp1bnhsmSLb.8Ua5rBgWXYV6sCE6fH93E5l_.n1OHILL d_a_y.ajfuR0xA23dy6iWnEhnTWENJOyvRdtCtQVOMptBI7DG9x4n3iAtbZn3RYNSIrZR1Coinj. CNe1Xk3fW4T8JcVeXf7j9gCi08Rdo6VZRwOqPSOqU53HMxsIxQrBEdRheuKquS6_MmrB87bf7_RO .x8pbt5tM49Dk1Suclx1HH5Eiue7L1Nci43LZuUwY72c.d29qBt79YxWA8Tug49zLwGNZGIM7_.i fT3VpUUxELAsdTMfsyyV0_19Yt3AYlF5ExY.kZ3YHL9bIQgSkAx_hZeQDDxEv8BAGb.dzR_zF9BY IzYNN122QBdF5LC5sD1SxgCaKpOmU.TyswPx_v7z_AvCO99AFv2fbQdbCO2SmNTH5LcwIuHp6pmV GALddsXXNT6ONoit3adpgMZaSsD4.kzX7c84Lx6GH7eXAO_G41vHX2ZSZMSxa6FtPSm3VgkYnnG5 FNs6KPEaJkKB05uLnC9r.AOSZO3WQ_1eLPqzB.6TUd7sP.Uf6sp4LlT6R69CYXkXx1wa4oaHvYsT 1n89Ppn32oqBibr7xjnSahw3lIkMOikf69LEtCu_xj5YiMqHZxxVkx860vbmtoqIrirdK.DyiUoS mD8R.75wBvqPGPu0Vid7dddUCC.pSjjRZ.78qXs0P8nKYaps9UbX52GTw.8vUjngv7ZzeuAHaW9Z xMCSSntI55c_1NeZOVHCS65CJ31MqUlhmqderKgN5.vT6uvfk.9IsZ5BLL7Ivhw_oWtfs99cWHHK CoU8nhMWbnOfvZkH_TPEfz6zFEZlqIrLWDt4D3.MA97Mz3XDqx0Lhodo1rd6J_Ryt.TSBc8QR5jC tCKYZnj1yv5KYsJnmylW9JX0llPFMRHYVip35w6KGvZmDFI0gATtNq3ykjg-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Thu, 28 Jan 2021 10:28:57 +0000 Received: by smtp412.mail.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 40d7c838bbdd9f144b5ee953ce4900ae; Thu, 28 Jan 2021 10:28:53 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.40.0.2.32\)) Subject: Re: git setup/usage question From: Mark Millard In-Reply-To: <20210128110857.0ff1db28@zeta.dino.sk> Date: Thu, 28 Jan 2021 02:28:51 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> <20210128073315.44377b29@zeta.dino.sk> <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> <20210128110857.0ff1db28@zeta.dino.sk> To: Milan Obuch X-Mailer: Apple Mail (2.3654.40.0.2.32) X-Rspamd-Queue-Id: 4DRGsl1RPmz4v29 X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.68.82:from]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.68.82:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.82:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.82:from]; RCVD_COUNT_TWO(0.00)[2]; 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: Thu, 28 Jan 2021 10:29:00 -0000 On 2021-Jan-28, at 02:08, Milan Obuch wrote: > On Thu, 28 Jan 2021 01:44:48 -0800, Mark Millard > wrote: > >> On 2021-Jan-27, at 22:33, Milan Obuch wrote: >> >>>> . . . >>> >>> With some tweaks, things are perfectly working now, for me >>> everything is perfectly logical. Actually I would describe it as >>> expected for using multiple worktrees, not vasting space (keeping >>> multiple full repositories) and time (updating multiple >>> repositories). >> >> FYI: I have only one .git/ and multiple worktrees, but I did not >> use --bare . One worktree is the (implicit) primary one in the >> directory that contains the only .git/ . The other worktrees I >> added after the initial clone. >> > > ... so currently we are using basically the same setup, I just have no > implicit worktree, I created main worktree explicitly. Functionally it > is totally equivalent, just with small, cosmetic, difference I can > place my main worktree anywhere in file system. > >> In other words, I did what Warner suggested and documents >> for that aspect, although using my own naming conventions. >> >> I never use the same branch in more than one worktree. >> All the worktrees automatically find the .git/ . And >> from the .git/ materials git can also find the >> worktrees for the branches that have such. >> > > I saw an article on this subject suggesting basically you can work on > more unrelated things in parallel. Think of developing new feature in > one worktree and creating another worktree for working on quick fix > needed for coping with some catastrophic failure, which must be done > asap. You need not to think how you should save your work, just switch > into relevant worktree and do it. > > I see another usefull case - working on a feature, which requires for > some reason worktree remaining unchanged for some extended period of > time. I can still follow development in another worktree for the same > branch without disturbing work done elsewhere. Worktrees are basically > independent on each other. > >> I do fetch and the --ff merge separately. I use the --ff >> style so that if at some point it can not do a fast-forward >> it will report that and not do something else. Without the >> --ff , if such a mess-up happens, then it will instead do >> something else. In other words: I have it validate the >> expected type of context actually exists. (Paranoia >> coverage.) >> > > We do not disagree here. Actually git-merge man page tells --ff is the > default, --no-ff being used in some special case. I could be wrong, but > to me it looks mentioned special case does not occur when tracking > stable branch. If, however, something bad happens, I can still throw > away damaged worktree and create new one from scratch. The branch in the .git/ would be "damaged". The problem would not be limited to a worktree's separate directory tree. (Unless one uses --no-commit on the merge, I guess.) >>>> It looks to me like he is using a configuration (--bare) >>>> outside the range FreeBSD is intending to deal with and >>>> so he needs his own fairly-unique procedures for using >>>> git for FreeBSD activity. >>> >>> >>> I think exactly the opposite - the way I did it looks (at least to >>> me) as a natural way extending simple case described in Warner's >>> Git Primer if one desires to track multiple branches for whatever >>> reason. >> >> FYI: Warner documented using worktrees without using --bare >> for the FreeBSD git context and stated that he would not >> document --bare use. I tried what he documented and it >> worked just fine for my use. >> > > As far as I tested for now, the only difference between standard and > --bare usage is no implicit repository and (main) worktree linkage. > There may be something else there not discovered yet, but my ongoing > testing seems to confirm this is actually the case. You indicated earlier that --bare disallowed --origin use. I used the -o freebsd in my clone and have such an origin. I can use instructions/documentation that presumes the normal origin configuration --and do so "as is" in the instructions. >>> I am still fine tuning my setup and gaining more experiences with >>> git, but in my oppinion (and others as well, I found some articles >>> mentioning exactly the same) worktrees are really powerfull tool >>> for a developer, which, when used with some thinking and carefully, >>> could make one's development much easier. >> >> I am using worktrees. But I am not using --bare . So far as >> I know, any differences are tied to that distinction. >> >>> I plan to document my setup soon with simple steps to re-create it >>> and some explanations as well. I do not still understand everything >>> in detail, but what I tried makes me confident I can use git this >>> way effectively. >>> >> >> Cool. Sounds like you and David W. may be providing some >> support for folks that want to use --bare (examples of >> a couple of ways of using git with --bare for FreeBSD). >> > > If anybody would like to try something and think they could use my > help, just ask. I am far from git expert, but as I was forced to use > git now, I found it actually be easy to use and logically built. > > I am not happy with dependencies required by our git port, or, more > exactly, with number of dependencies (some time in past this stopped me > from trying when I saw all the ports required to use git). I'd like to > keep port count minimal, but sometimes it just does not work this way. I use devel/git@lite to avoid a bunch of dependencies that I do not need. There is also devel/git@tiny that I've not tried. For reference: OPTIONS_RADIO_PCRE_VERSION= PCRE PCRE2 OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \ SEND_EMAIL NLS SUBTREE . . . .if ${FLAVOR:U} == gui OPTIONS_SLAVE+= GUI .elif ${FLAVOR:U} == lite OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS PERL .elif ${FLAVOR:U} == tiny OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NCURL} ${OPTIONS_RADIO_PCRE_VERSION} OPTIONS_SLAVE= CURL .endif === Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Thu Jan 28 10:45:27 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 E02934FFFF6 for ; Thu, 28 Jan 2021 10:45:27 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from mailhost.netlabit.sk (mailhost.netlabit.sk [84.245.65.72]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRHDl1CF5z3BmL for ; Thu, 28 Jan 2021 10:45:26 +0000 (UTC) (envelope-from freebsd-git@dino.sk) Received: from zeta.dino.sk (fw3.dino.sk [84.245.95.254]) (AUTH: LOGIN milan) by mailhost.netlabit.sk with ESMTPA; Thu, 28 Jan 2021 11:45:24 +0100 id 00F404E3.601295C4.0001834E Date: Thu, 28 Jan 2021 11:45:22 +0100 From: Milan Obuch To: Mark Millard Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: <20210128114522.2f2beadd@zeta.dino.sk> In-Reply-To: References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> <20210128073315.44377b29@zeta.dino.sk> <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> <20210128110857.0ff1db28@zeta.dino.sk> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i386-portbld-freebsd11.4) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DRHDl1CF5z3BmL X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd-git@dino.sk designates 84.245.65.72 as permitted sender) smtp.mailfrom=freebsd-git@dino.sk X-Spamd-Result: default: False [-3.30 / 15.00]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[dino.sk]; RBL_DBL_DONT_QUERY_IPS(0.00)[84.245.65.72:from]; SPAMHAUS_ZRD(0.00)[84.245.65.72:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEMAIL_TO(0.00)[yahoo.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:5578, ipnet:84.245.64.0/18, country:SK]; RCVD_COUNT_TWO(0.00)[2]; 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: Thu, 28 Jan 2021 10:45:27 -0000 On Thu, 28 Jan 2021 02:28:51 -0800, Mark Millard wrote: > On 2021-Jan-28, at 02:08, Milan Obuch wrote: > > > On Thu, 28 Jan 2021 01:44:48 -0800, Mark Millard > yahoo.com> wrote: [ snip ] > >> I do fetch and the --ff merge separately. I use the --ff > >> style so that if at some point it can not do a fast-forward > >> it will report that and not do something else. Without the > >> --ff , if such a mess-up happens, then it will instead do > >> something else. In other words: I have it validate the > >> expected type of context actually exists. (Paranoia > >> coverage.) > >> > > > > We do not disagree here. Actually git-merge man page tells --ff is > > the default, --no-ff being used in some special case. I could be > > wrong, but to me it looks mentioned special case does not occur > > when tracking stable branch. If, however, something bad happens, I > > can still throw away damaged worktree and create new one from > > scratch. > > The branch in the .git/ would be "damaged". The problem > would not be limited to a worktree's separate directory tree. > (Unless one uses --no-commit on the merge, I guess.) > We'll see. When you do not commit anything into repository for that branch, I can't think of such a possibility. For such case, change flow (propagation) is 'FreeBSD's git server' ->(git fetch)-> local bare repository ->(git merge)-> local worktree. As long as you do not commit anything for given branch, this is unidirectional. Still worst case scenarion would be throwing away whole repository and starting from scratch. I do not think of a disaster which would require this, short of hardware disk failure, but that's it. [ snip ] > >> FYI: Warner documented using worktrees without using --bare > >> for the FreeBSD git context and stated that he would not > >> document --bare use. I tried what he documented and it > >> worked just fine for my use. > >> > > > > As far as I tested for now, the only difference between standard and > > --bare usage is no implicit repository and (main) worktree linkage. > > There may be something else there not discovered yet, but my ongoing > > testing seems to confirm this is actually the case. > > You indicated earlier that --bare disallowed --origin use. I > used the -o freebsd in my clone and have such an origin. I > can use instructions/documentation that presumes the normal > origin configuration --and do so "as is" in the instructions. > Details covered in my setup description, yet to be published. I found a way to overcome this limitation as I tested how to achieve what I want. [ snip ] > >>> I plan to document my setup soon with simple steps to re-create it > >>> and some explanations as well. I do not still understand > >>> everything in detail, but what I tried makes me confident I can > >>> use git this way effectively. > >>> > >> > >> Cool. Sounds like you and David W. may be providing some > >> support for folks that want to use --bare (examples of > >> a couple of ways of using git with --bare for FreeBSD). > >> > > > > If anybody would like to try something and think they could use my > > help, just ask. I am far from git expert, but as I was forced to use > > git now, I found it actually be easy to use and logically built. > > > > I am not happy with dependencies required by our git port, or, more > > exactly, with number of dependencies (some time in past this > > stopped me from trying when I saw all the ports required to use > > git). I'd like to keep port count minimal, but sometimes it just > > does not work this way. > > I use devel/git@lite to avoid a bunch of dependencies that I do > not need. There is also devel/git@tiny that I've not tried. For > reference: > > OPTIONS_RADIO_PCRE_VERSION= PCRE PCRE2 > OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV > CURL \ SEND_EMAIL NLS SUBTREE > . . . > .if ${FLAVOR:U} == gui > OPTIONS_SLAVE+= GUI > .elif ${FLAVOR:U} == lite > OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS PERL > .elif ${FLAVOR:U} == tiny > OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NCURL} > ${OPTIONS_RADIO_PCRE_VERSION} OPTIONS_SLAVE= CURL > .endif > I'll try it some time later. Regards, Milan From owner-freebsd-git@freebsd.org Thu Jan 28 11:34:24 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 CCD0E521FB3 for ; Thu, 28 Jan 2021 11:34:24 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRJKD19rMz3FC7 for ; Thu, 28 Jan 2021 11:34:23 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: by mail-oi1-x22c.google.com with SMTP id h6so5661271oie.5 for ; Thu, 28 Jan 2021 03:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay-org.20150623.gappssmtp.com; s=20150623; h=content-transfer-encoding:from:mime-version:subject:date:message-id :references:cc:in-reply-to:to; bh=ZPTGjaugtAVYjAuGI/DR4W9A5jaxwqqbrIFA2z2r6cw=; b=pd8n44pAzrBKWcHPVOTde/qEBQbdh28Sg4B9f2R6ZRuJI74GXwMJssAsLgWXZc7OMu z3HfjMzb91/yc00WwGU4niLb9WNZuM1mFyTMacXvAkMs11p963IYE6CYYJ26XJ0lFI97 l2z6NUBrtsQrD5V0YX7z239/gQ35+chKhfThKqq2jwSp5e6OgtCFzsZghR7YMR/iv6uF PQUFx4vqwQGVw2HRg1d/nBsrSrQ8SXkQn/zZ65UdKVUw/X9JjU2pRuQByPAXeFHtcAN1 1P8tNTjKbBXxq7GLg6pB5eodA+7q3Ja9Ue5+P+fYgcp3DWKevnChpRo3QplAvu0xNxsY KnEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:content-transfer-encoding:from:mime-version :subject:date:message-id:references:cc:in-reply-to:to; bh=ZPTGjaugtAVYjAuGI/DR4W9A5jaxwqqbrIFA2z2r6cw=; b=oOKBZ5zqwK7MDfqMKAgHEb2UDgOMRu8qR+Kda3YWjhsIosLssI6VfGpgXktZBCQL7M mYpYaQw3UfQS/cihOHICHVq+tagimo9A8S9Ur1Tyg0EuQXwVsIvhcWUyvECK0B5iaD6j aZASRQkE4wiKflBbKVru8VsQUtP831wqR8RTjNgd0oNIhCmYwWoHMpN2vYvrQKJ5M6/T kCfNw0m+iuoVexpLAvcx7StMngqWM4y4o3uWqWc6KjSKcnQ2IkPxLCe6odVGJAIWxQJx WpXDj9frnPSxzxn24/AIS7ZRxan89yDFwGxtkMwip+CWRhYAZPdY5EMqSgMXHNwlfnE/ cyVA== X-Gm-Message-State: AOAM531XuShLrE5nh8ZlqQIQrEJty6qodpKstiKeZH0NxrVIqnZ+nNoI vjkagxh0oczgFYXu6h4tANUIb/ERoTUVvA== X-Google-Smtp-Source: ABdhPJw8wWQEGFCfiuGJMhb6nwxPpdfPjfTx3J5PcuZAM00SspBEgvkrOpc6UTpC0mM1aAsGcDPXxw== X-Received: by 2002:aca:5342:: with SMTP id h63mr6130081oib.42.1611833662455; Thu, 28 Jan 2021 03:34:22 -0800 (PST) Received: from [192.168.1.69] (172-125-77-130.lightspeed.sntcca.sbcglobal.net. [172.125.77.130]) by smtp.gmail.com with ESMTPSA id d127sm997045oob.14.2021.01.28.03.34.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 28 Jan 2021 03:34:21 -0800 (PST) From: Bakul Shah Mime-Version: 1.0 (1.0) Subject: Re: git setup/usage question Date: Thu, 28 Jan 2021 03:34:19 -0800 Message-Id: <7E81EF70-97EC-4B10-83CE-4D25E443F09D@iitbombay.org> References: <20210128114522.2f2beadd@zeta.dino.sk> Cc: Mark Millard , freebsd-git@freebsd.org In-Reply-To: <20210128114522.2f2beadd@zeta.dino.sk> To: Milan Obuch X-Mailer: iPad Mail (18D52) X-Rspamd-Queue-Id: 4DRJKD19rMz3FC7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=iitbombay-org.20150623.gappssmtp.com header.s=20150623 header.b=pd8n44pA; dmarc=none; spf=pass (mx1.freebsd.org: domain of bakul@iitbombay.org designates 2607:f8b0:4864:20::22c as permitted sender) smtp.mailfrom=bakul@iitbombay.org X-Spamd-Result: default: False [-2.80 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[iitbombay-org.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::22c:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[iitbombay-org.20150623.gappssmtp.com:s=20150623]; FREEFALL_USER(0.00)[bakul]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[iitbombay.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::22c:from:127.0.2.255]; MANY_INVISIBLE_PARTS(0.20)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::22c:from]; FREEMAIL_CC(0.00)[yahoo.com,freebsd.org]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 28 Jan 2021 11:34:24 -0000 You might want to read this as to why bare repos are a problem with worktree= s & some solutions. https://stackoverflow.com/questions/54367011/git-bare-repositories-worktrees= -and-tracking-branches I wish I had read this earlier. Torek=E2=80=99s solution is quite clever. Ba= sically git clone $url cd $new-repo git checkout $(git commit-tree $(git hash-object -t tree /dev/null) < /dev/n= ull) This makes the new repo completely empty but you can add multiple worktrees,= no more than one per branch, for any local work. From owner-freebsd-git@freebsd.org Thu Jan 28 14:10:14 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 8C9A552605E for ; Thu, 28 Jan 2021 14:10:14 +0000 (UTC) (envelope-from news@mips.inka.de) Received: from mail.inka.de (mail.inka.de [IPv6:2a04:c9c7:0:1073:217:a4ff:fe3b:e77c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRMn166qqz3QC5 for ; Thu, 28 Jan 2021 14:10:13 +0000 (UTC) (envelope-from news@mips.inka.de) Received: from mips.inka.de (news@[127.0.0.1]) by mail.inka.de with uucp (rmailwrap 0.5) id 1l57zo-005txs-Jc; Thu, 28 Jan 2021 15:10:04 +0100 Received: from lorvorc.mips.inka.de (localhost [127.0.0.1]) by lorvorc.mips.inka.de (8.16.1/8.16.1) with ESMTP id 10SE7vaq028833 for ; Thu, 28 Jan 2021 15:07:57 +0100 (CET) (envelope-from news@lorvorc.mips.inka.de) Received: (from news@localhost) by lorvorc.mips.inka.de (8.16.1/8.16.1/Submit) id 10SE7vVk028832 for freebsd-git@freebsd.org; Thu, 28 Jan 2021 15:07:57 +0100 (CET) (envelope-from news) To: freebsd-git@freebsd.org From: Christian Weisgerber Newsgroups: list.freebsd.git Subject: Re: git setup/usage question Date: Thu, 28 Jan 2021 14:07:57 -0000 (UTC) Message-ID: References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> User-Agent: slrn/1.0.3 (FreeBSD) X-Rspamd-Queue-Id: 4DRMn166qqz3QC5 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of news@mips.inka.de has no SPF policy when checking 2a04:c9c7:0:1073:217:a4ff:fe3b:e77c) smtp.mailfrom=news@mips.inka.de X-Spamd-Result: default: False [-1.80 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[news]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from]; 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]; TO_DN_NONE(0.00)[]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a04:c9c7:0:1073:217:a4ff:fe3b:e77c:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[inka.de]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[naddy@mips.inka.de,news@mips.inka.de]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:202113, ipnet:2a04:c9c7::/32, country:DE]; FROM_NEQ_ENVFROM(0.00)[naddy@mips.inka.de,news@mips.inka.de]; 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: Thu, 28 Jan 2021 14:10:14 -0000 On 2021-01-28, David Wolfskill wrote: > That said, what I set up for my use does involve a "--bare" (more > precisely, a "--mirror") repo. > > I documented what I did at > https://www.catwhisker.org/~david/FreeBSD/repo-sync.html FWIW, a bare repository and checking out any number of worktrees from it is the normal way Got (devel/got) works. -- Christian "naddy" Weisgerber naddy@mips.inka.de From owner-freebsd-git@freebsd.org Thu Jan 28 15:07:09 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 6B9915272CC for ; Thu, 28 Jan 2021 15:07:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRP2h4TxBz3jCy for ; Thu, 28 Jan 2021 15:07:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82b.google.com with SMTP id t17so4273151qtq.2 for ; Thu, 28 Jan 2021 07:07:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Jw86SENsznXY9xtjT71C/NJI0waRZUudI36V5SbtSvY=; b=Tv59kfcYSHeBDqOhssxQH+fMOTpCna4eD742fWhyJpJs6+nGf76bojKOBn1i1UQUMT D94h0UQgba5jyvtSdLJ4Ym7xs74L4q+jGLXCAKOiteoOZ8E+/WuyvKRhnE1hI5TsEQf2 kN/UaVj0i+Q/mo29kLZKN+VHr1xlEaKACzyZDHOKPZjVK281QCu0iSupEP2oJCqU9hVE 1oDmBHVBTBc9NGnKrLHp8Z4lctNmKzpQOEj1OkCqaJe7vVXQit2wgtrfhq9SIvuxptA/ j8f30IoSGYf+XcAB4CuiXF6ZbY4eTqJwJONLHdwVx3I6eEsJNe1aUdTFwWzKkAHxu+PN AmYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Jw86SENsznXY9xtjT71C/NJI0waRZUudI36V5SbtSvY=; b=OjgaBZNV3j3zMZuvBB2GI8JXdoIrrwnnkfPsiWhaIcCismHj6ZZgzs9enbpk+Qkr8v UV4xx1Mt+QQs/1/LEFSbBisoK9hew4CtplvD1Ulvg75A/46m1xovohSYLa9Ho200bdmI Tx+vggYbMPzy3NTelnwE0Q9KLE3I6bLHqKtWAFleWbAwuj2hLek1Mlv3gd+imR1Fs8Bx 2oJthCoxlDnu5kK+ZEniwqYGEQI2WDkE7H73DKaR9ZYw3dpIM70ADiwinntLXDOPL+tX r0otph1+tbaqhm7KG7WYyBFsswPBm/INqumIWRHQLo68ZIe4uNKvDsuhnNQJp6lvHK/0 AFHg== X-Gm-Message-State: AOAM533RWscJJRziy9oScBScBGh0KDHWBa9cUZz5UMHQDf+ei2+zJ6vP 3W7DnaZLQTxWTM0w/Ot8nR7pWwj1WZZ0CejlSkDNolDavFc1bA== X-Google-Smtp-Source: ABdhPJw4OW50qCJpOQc38pv0Tv42pGpeD0rmsKNmDdhYkgu4gaPbS0jEne+jb0HK1PcoD2FycglfrsRFrgfGzTtBwmE= X-Received: by 2002:ac8:72cc:: with SMTP id o12mr14644224qtp.101.1611846427509; Thu, 28 Jan 2021 07:07:07 -0800 (PST) MIME-Version: 1.0 References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> <20210128073315.44377b29@zeta.dino.sk> <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> In-Reply-To: <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> From: Warner Losh Date: Thu, 28 Jan 2021 08:06:55 -0700 Message-ID: Subject: Re: git setup/usage question To: Mark Millard Cc: Milan Obuch , freebsd-git X-Rspamd-Queue-Id: 4DRP2h4TxBz3jCy X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Tv59kfcY; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::82b:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.997]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82b:from]; R_SPF_NA(0.00)[no SPF record]; FREEMAIL_TO(0.00)[yahoo.com]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::82b:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 28 Jan 2021 15:07:09 -0000 On Thu, Jan 28, 2021 at 2:45 AM Mark Millard via freebsd-git < freebsd-git@freebsd.org> wrote: > > > On 2021-Jan-27, at 22:33, Milan Obuch wrote: > >>>> . . . > >> > >> It looks to me like he is using a configuration (--bare) > >> outside the range FreeBSD is intending to deal with and > >> so he needs his own fairly-unique procedures for using > >> git for FreeBSD activity. > > > > > > I think exactly the opposite - the way I did it looks (at least to me) > > as a natural way extending simple case described in Warner's Git Primer > > if one desires to track multiple branches for whatever reason. > > FYI: Warner documented using worktrees without using --bare > for the FreeBSD git context and stated that he would not > document --bare use. I tried what he documented and it > worked just fine for my use. > I experimented with bare and hated it. I have about 30 in-flight patches, most of them trivial. Doing this for a few years, I've found the following: 1. worktrees are great for long-term things. So I have a work tree for stable/12 and main and occasionally for big projects. 2. 30 small branches with 1 change is better than 1 branch with 30 changes. As crazy as it sounds, it's easier to manage, especially when waiting for reviews. 3. It's much better to switch branches often and practice good hygiene by committing all changes. 4. Commit early, commit often, rebase frequently to curate the changes as you go. 5. Keep changes small. 6. Get the basics into review early, especially ones that are surprising. I make liberal use of git cherry-pick to move patches from branch to branch if I notice something while working on something else. I rebase to reorder and reorganize patches. I keep changes small and as independent as possible. There's no advantage to --bare for my workflow. When I tried it, I wound up with more complexity without any benefit. Same when I over-used worktrees. For me, there was more benefit from having lots of small branches and always keeping a clean tree. I avoided stash, though it's closer to mercurial's mq workflow I used to love (unpushed patches tend to go stale quickly). These are among the reasons I've left the lots of work trees and/or using a bare repo stuff undocumented: IMHO it just adds complexity and confusion for the vast majority of users w/o there being much benefit. People can extrapolate from what's documented should they have special needs. Warner From owner-freebsd-git@freebsd.org Thu Jan 28 15:17:34 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 52159527342 for ; Thu, 28 Jan 2021 15:17:34 +0000 (UTC) (envelope-from stsp@stsp.name) Received: from einhorn-mail-out.in-berlin.de (einhorn-mail-out.in-berlin.de [217.197.80.21]) (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 (4096 bits) client-digest SHA256) (Client CN "mail.in-berlin.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DRPGj3LD7z3k7X for ; Thu, 28 Jan 2021 15:17:33 +0000 (UTC) (envelope-from stsp@stsp.name) X-Envelope-From: stsp@stsp.name Received: from authenticated.user (localhost [127.0.0.1]) by einhorn.in-berlin.de with ESMTPSA id 10SFHSa7012111 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 28 Jan 2021 16:17:30 +0100 Received: from localhost (byrne.stsp.name [local]) by byrne.stsp.name (OpenSMTPD) with ESMTPA id 4e198532; Thu, 28 Jan 2021 16:17:28 +0100 (CET) Date: Thu, 28 Jan 2021 16:17:28 +0100 From: Stefan Sperling To: Christian Weisgerber Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: Mail-Followup-To: Christian Weisgerber , freebsd-git@freebsd.org References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4DRPGj3LD7z3k7X X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of stsp@stsp.name has no SPF policy when checking 217.197.80.21) smtp.mailfrom=stsp@stsp.name X-Spamd-Result: default: False [-2.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[stsp.name]; RBL_DBL_DONT_QUERY_IPS(0.00)[217.197.80.21:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[217.197.80.21:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; 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:29670, ipnet:217.197.80.0/20, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_IN_DNSWL_LOW(-0.10)[217.197.80.21:from] 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, 28 Jan 2021 15:17:34 -0000 On Thu, Jan 28, 2021 at 02:07:57PM -0000, Christian Weisgerber wrote: > On 2021-01-28, David Wolfskill wrote: > > > That said, what I set up for my use does involve a "--bare" (more > > precisely, a "--mirror") repo. > > > > I documented what I did at > > https://www.catwhisker.org/~david/FreeBSD/repo-sync.html > > FWIW, a bare repository and checking out any number of worktrees > from it is the normal way Got (devel/got) works. There are a couple of additional aspects of Got which will seem familiar to former CVS/SVN users: - mixed-commit work trees operate just like with SVN, such that 'got update sys/dev/iwm' will do exactly what SVN users expect - relatively small command set with familiar names and options: checkout, update, info, revert -R, ... See the man page for more: https://gameoftrees.org/got.1.html - strong focus on the centralized repository use case; the idea is to store one repository per machine as was done with CVSup/svnsync That said, while this software is functional it is still under development. The current feature set should be more than complete enough to support anyone tracking development sources in a read-only fashion. But we're not ready to set the UI in stone, meaning scripts using Got may break. This is not a "set it up once and forget" solution. New releases occur every couple of weeks and are similar to "-current" snapshots rather than "-stable" releases. For now, I would suggest to stay away from Got unless you like what you see and would want this software to become truly production-ready. Then, by all means, use it and provide feedback to help our progress. Cheers, Stefan From owner-freebsd-git@freebsd.org Thu Jan 28 18:52:39 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 7241D4E7100 for ; Thu, 28 Jan 2021 18:52:39 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (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 4DRV2t5cRYz4WK6 for ; Thu, 28 Jan 2021 18:52:38 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 23AD73C0199; Thu, 28 Jan 2021 18:52:32 +0000 (UTC) Date: Thu, 28 Jan 2021 18:52:32 +0000 From: Brooks Davis To: Warner Losh Cc: Mark Millard , freebsd-git Subject: Re: git setup/usage question Message-ID: <20210128185232.GB9390@spindle.one-eyed-alien.net> References: <20210126151017.4a9dd711@zeta.dino.sk> <00F58366-4178-458E-8865-E1A2E5324EB4@yahoo.com> <20210128073315.44377b29@zeta.dino.sk> <1F06D4FA-D3B0-4B25-AC99-14A0F31C2ABF@yahoo.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="V0207lvV8h4k8FAm" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4DRV2t5cRYz4WK6 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-3.90 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[199.48.129.229:from]; FREEFALL_USER(0.00)[brooks]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[199.48.129.229:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; R_SPF_NA(0.00)[no SPF record]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; MAILMAN_DEST(0.00)[freebsd-git]; FREEMAIL_CC(0.00)[yahoo.com,freebsd.org] 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, 28 Jan 2021 18:52:39 -0000 --V0207lvV8h4k8FAm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jan 28, 2021 at 08:06:55AM -0700, Warner Losh wrote: > These are among the reasons I've left the lots of work trees and/or using a > bare repo stuff undocumented: IMHO it just adds complexity and confusion > for the vast majority of users w/o there being much benefit. People can > extrapolate from what's documented should they have special needs. Worktrees are quite useful, but IMO we've probably over-documented then our base docs. Most people don't need them and the subtle differences they impose on workflows vs trivial clones makes it (very slightly) harder for people to find answers to their git questions. I'm happy to see people write these things up, but >90% of people are probably better off just wasting a little diskspace and bandwidth. -- Brooks --V0207lvV8h4k8FAm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJgEwfvAAoJEKzQXbSebgfAjWIH/iQQh17Oi3gY8tuX6wmmaTw3 tfLR+8ka6Lc47i14cJawmma9cE44EQKjsEQ2Yxf2wePU5JTR0dnrvTAAFnrDHPpm qGCsZjitZhphO48Wmi184s4UNKoiOWlNuuuafVJUnPzuRs6/pJvGUQTiN73X4cOH 50bgJVESj7JujuoqgCwHx1y/148Pq6EYoEVppI/M9KxdT+HIJxH1qGxJLpfZydTR cPe5N+ciJrk7s35UXHdIuAE3ZfmnUwc8UcZlaGzQCesbMX2E8OsYMmGfOxXfTGEv lqYuUnFb0XcUjAW/l68Yr7bjaql30nhEFm8E+NdUarW8N5XcBMYZl0TFwb1CRrg= =Z9Yw -----END PGP SIGNATURE----- --V0207lvV8h4k8FAm-- From owner-freebsd-git@freebsd.org Fri Jan 29 20:12:17 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 C53834F8147 for ; Fri, 29 Jan 2021 20:12:17 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DS7mJ6shmz3sdx; Fri, 29 Jan 2021 20:12:16 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ot1-f46.google.com with SMTP id k8so9817112otr.8; Fri, 29 Jan 2021 12:12:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=0tsQCxFWuWJr/YF2hWO3GYGD+XnzGW5L5nzmW0Iw+j8=; b=P0f2GVPjR1ciYrHGdW2T7feCROOxaQ9D4JIc2o+hvqZzzZtL5dgg5/dVxJ6n5fv8mT 6Tg/Yqw2exIQKv2CHjmh+26yKWRby/1ZcL7dER3PmvzvuGNmn551bP6riHxQb5Rl2ls9 qTNOa7nKgpwOGMF4qZOOf0q8uDbDSpvAJ5T/7so5/CcWVnwc2SHxRIO0ch/DxW/tD6+C Ug7P56mr117Er59gnbdR1ZCncrXbqoeuD4fAK33nNKc1lzS6jftMqpvVOzyxQUBfqZ9f HrD1uajXFE7Hqe6dEgx36RLML0iTVN0+g2sRMMu5VJ5r3Q9Jk3puPj5yPTE+pWbIUSOU dO6Q== X-Gm-Message-State: AOAM533Nn5mwFUe5pn28NZOomKFliKOy4gdTnc12xs4T0mxTfMCMYkib CwS+cVEGtMfZX0svWrPnlzuWJYr4iVrGQYIfnAmu+KtU4IBZNQ== X-Google-Smtp-Source: ABdhPJzEPP4Lx+Hg2L5thErpfs/azP8Ylv56rYjIxZTrs954IRGL3rOkDZSb77VxOpR8KwyuX/gT8rtPz29GdtzCeHk= X-Received: by 2002:a05:6830:22f8:: with SMTP id t24mr3973400otc.18.1611951135382; Fri, 29 Jan 2021 12:12:15 -0800 (PST) MIME-Version: 1.0 From: Alan Somers Date: Fri, 29 Jan 2021 13:12:04 -0700 Message-ID: Subject: git transition plan for base/user/cperciva/freebsd-update-build To: freebsd-git , Gordon Tetlow , Colin Percival X-Rspamd-Queue-Id: 4DS7mJ6shmz3sdx X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.210.46 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [0.99 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FREEFALL_USER(0.00)[asomers]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.210.46:from]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.46:from]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; SPAMHAUS_ZRD(0.00)[209.85.210.46:from:127.0.2.255]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.46:from]; NEURAL_SPAM_SHORT(0.99)[0.994]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Fri, 29 Jan 2021 20:12:17 -0000 What is the plan to transition the https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ code? It's not really a branch of src; it's more like an independent project. Will it be getting its own repository? -Alan From owner-freebsd-git@freebsd.org Fri Jan 29 20:28:22 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 75B6B4F8A00 for ; Fri, 29 Jan 2021 20:28:22 +0000 (UTC) (envelope-from SRS0=Z/9q=HA=FreeBSD.org=otis@ns2.wilbury.net) Received: from ns2.wilbury.net (ns2.wilbury.net [92.60.51.55]) (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 "svc.wilbury.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DS86t2D91z3v7l; Fri, 29 Jan 2021 20:28:22 +0000 (UTC) (envelope-from SRS0=Z/9q=HA=FreeBSD.org=otis@ns2.wilbury.net) Received: from chemex.owhome.lan (gw-upc.owhome.net [188.167.168.254]) (Authenticated sender: juraj@lutter.sk) by svc.wilbury.net (Postfix) with ESMTPSA id E4E5245D043; Fri, 29 Jan 2021 21:28:13 +0100 (CET) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: git transition plan for base/user/cperciva/freebsd-update-build From: Juraj Lutter In-Reply-To: Date: Fri, 29 Jan 2021 21:28:13 +0100 Cc: freebsd-git , Gordon Tetlow , Colin Percival Content-Transfer-Encoding: quoted-printable Message-Id: References: To: Alan Somers X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4DS86t2D91z3v7l X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Fri, 29 Jan 2021 20:28:22 -0000 > On 29 Jan 2021, at 21:12, Alan Somers wrote: >=20 > What is the plan to transition the > https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ = code? > It's not really a branch of src; it's more like an independent = project. > Will it be getting its own repository? This is a good question. The other question is if it could be simplified = somehow, for use cases where users do not want/need patches and only want to = build updates for their running systems for regular maintenance. From owner-freebsd-git@freebsd.org Fri Jan 29 21:06:47 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 4FF034F9297 for ; Fri, 29 Jan 2021 21:06:47 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DS8zC1j2bz3wLZ; Fri, 29 Jan 2021 21:06:47 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ot1-f50.google.com with SMTP id i20so9969824otl.7; Fri, 29 Jan 2021 13:06:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=n3JbM9ioAHLPPQdC8plMYJENZjaUEhzTLvPUxK1nx2k=; b=aokRHQbotLkz+zSTyIZcVbdgWXhYylZGYGUHOAo/zouo5lhmAIMzPeUB2jqHgzWDvt Dd3gZTEe9N2SYvx7+LQiY+iRCiuaYGiya7Aa8YIx0yufLMjT5e8m4AQjEmeHN6DNMIo+ N4yFZDw/xL+p4KirxQ3rdtl0DAQdke4i+/1yLxpQkdUBby6wDnsvO+8QQgpj83X44OVS dysHXHo+znLDyoy1oep/0FXHLzKDrJkDgsGMxZJURBWY5euQx/0u3sKQ5YdX+F6i7X5D gVH164av6Ib7KEVxXZlsC1MIkM0aaOfQo+rAzrbvOA4IzLVAGmlqqzGupj2lsbpRoIU/ 2Iuw== X-Gm-Message-State: AOAM533jZQjBW2w3t9zbGYFDTgKuvqU0t/hBccojmiOU+7RcBhVTDmrW hb+1WL2HyJO05v5LkMytW+3bIliq2F14vBm0B9mIe5DdyjE= X-Google-Smtp-Source: ABdhPJwE0BS5rztlGC2mh5FmvrsPCpHYFeqWHwjSCSX4kus83auKh5jbCI0fVN5DroiaafsCpFkFD6ameVof+OUwlYQ= X-Received: by 2002:a05:6830:22f8:: with SMTP id t24mr4098721otc.18.1611954405644; Fri, 29 Jan 2021 13:06:45 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Alan Somers Date: Fri, 29 Jan 2021 14:06:34 -0700 Message-ID: Subject: Re: git transition plan for base/user/cperciva/freebsd-update-build To: Juraj Lutter Cc: freebsd-git , Gordon Tetlow , Colin Percival X-Rspamd-Queue-Id: 4DS8zC1j2bz3wLZ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Fri, 29 Jan 2021 21:06:47 -0000 On Fri, Jan 29, 2021 at 1:28 PM Juraj Lutter wrote: > > > > On 29 Jan 2021, at 21:12, Alan Somers wrote: > > > > What is the plan to transition the > > https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ > code? > > It's not really a branch of src; it's more like an independent project. > > Will it be getting its own repository? > > This is a good question. The other question is if it could be simplified > somehow, > for use cases where users do not want/need patches and only want to build > updates for > their running systems for regular maintenance. > For users who don't need patches? Do you mean as a substitute for the old: $ cd /usr/src $ svn up $ make buildworld $ make buildkernel Or by "don't need patches", do you mean building updates based on tracking stable/12 instead of downloading the security advisory patches? I don't think the former makes sense. For just one system, building world and kernel by hand is much easier than using freebsd-update-build. -Alan From owner-freebsd-git@freebsd.org Fri Jan 29 21:21:12 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 E4AE74F9654 for ; Fri, 29 Jan 2021 21:21:12 +0000 (UTC) (envelope-from SRS0=Z/9q=HA=FreeBSD.org=otis@ns2.wilbury.net) Received: from ns2.wilbury.net (ns2.wilbury.net [IPv6:2a01:b200:0:1:f816:3eff:fecd:13e6]) (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 "svc.wilbury.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DS9Hr5XX0z4RD0; Fri, 29 Jan 2021 21:21:12 +0000 (UTC) (envelope-from SRS0=Z/9q=HA=FreeBSD.org=otis@ns2.wilbury.net) Received: from chemex.owhome.lan (gw-upc.owhome.net [188.167.168.254]) (Authenticated sender: juraj@lutter.sk) by svc.wilbury.net (Postfix) with ESMTPSA id E535A45D028; Fri, 29 Jan 2021 22:21:02 +0100 (CET) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: git transition plan for base/user/cperciva/freebsd-update-build From: Juraj Lutter In-Reply-To: Date: Fri, 29 Jan 2021 22:21:02 +0100 Cc: freebsd-git , Gordon Tetlow , Colin Percival Content-Transfer-Encoding: quoted-printable Message-Id: <27283DDB-E304-4840-A4E1-1DAF16C7731C@FreeBSD.org> References: To: Alan Somers X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4DS9Hr5XX0z4RD0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Fri, 29 Jan 2021 21:21:13 -0000 > On 29 Jan 2021, at 22:06, Alan Somers wrote: >=20 > On Fri, Jan 29, 2021 at 1:28 PM Juraj Lutter wrote: >=20 >=20 > > On 29 Jan 2021, at 21:12, Alan Somers wrote: > >=20 > > What is the plan to transition the > > https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ = code? > > It's not really a branch of src; it's more like an independent = project. > > Will it be getting its own repository? >=20 > This is a good question. The other question is if it could be = simplified somehow, > for use cases where users do not want/need patches and only want to = build updates for > their running systems for regular maintenance. >=20 > For users who don't need patches? Do you mean as a substitute for the = old: >=20 > $ cd /usr/src > $ svn up=20 > $ make buildworld > $ make buildkernel >=20 > Or by "don't need patches", do you mean building updates based on = tracking stable/12 instead of downloading the security advisory patches? = I don't think the former makes sense. For just one system, building = world and kernel by hand is much easier than using freebsd-update-build. Yes, I mean building updates based on tracking stable/12 (a rolling? = release, sort of). For just one system, buildworld seems OK, but for more systems it may be = a burden. Have you also considered pkgbase? From owner-freebsd-git@freebsd.org Fri Jan 29 21:42:04 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 160224FA216 for ; Fri, 29 Jan 2021 21:42:04 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DS9lw02hWz4Skc; Fri, 29 Jan 2021 21:42:03 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oi1-f173.google.com with SMTP id m13so11467452oig.8; Fri, 29 Jan 2021 13:42:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=DOydth90kTB5DmsPaYoCMiCBxpOeVnetGbeeTybNNw4=; b=AJBctZ8kszdnzhbD4b2mdqvjL36faMdCsK33VCk7R+R65Tggtwaj6ox7/sce03hI6b j6+DQXMJ7X9+fEqRiVHTdGkMEjr/SOWNmz4iWU67hJxCKIldUlwxLFDQ41oR714kzGyQ RNb3Eiev0/EGLoAzMN3fjpcO1+QMTOZ6iz/QkwtQj+EazwVfwBMdwfOLGmWHwUf4BNdf C2euAwUIwmR6mVHNcIUYww77UhE/WcLZr9vOV7qe+yNmD94ckMZ/0DV2t5X6tWjV+Jpa M7/4Zo0FUl/q4DZSBmURGifmd0HWu+gkzXQmPjaqz4Jv++N8ZsOBvvB4fJZ9CYz31sYv 7AIw== X-Gm-Message-State: AOAM53382pQ0rKVYZbzsoi05LoWFKQzCb8tAD/ZvXgFs+ICg588Lp28C yXdV7FEoSFhTm8AIiSK0xOeTbT8dUiNOUJc7xs3TUE992DI= X-Google-Smtp-Source: ABdhPJz93N7i8qmIEEPXaG8qKf0H8jwBDDEAOL9NbUqSddAvZlf6ATZUFo07fcfZ22bwx1ZMAxMfv2ISGIf2URDGDuo= X-Received: by 2002:aca:dd08:: with SMTP id u8mr3978583oig.55.1611956522615; Fri, 29 Jan 2021 13:42:02 -0800 (PST) MIME-Version: 1.0 References: <27283DDB-E304-4840-A4E1-1DAF16C7731C@FreeBSD.org> In-Reply-To: <27283DDB-E304-4840-A4E1-1DAF16C7731C@FreeBSD.org> From: Alan Somers Date: Fri, 29 Jan 2021 14:41:51 -0700 Message-ID: Subject: Re: git transition plan for base/user/cperciva/freebsd-update-build To: Juraj Lutter Cc: freebsd-git , Gordon Tetlow , Colin Percival X-Rspamd-Queue-Id: 4DS9lw02hWz4Skc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Fri, 29 Jan 2021 21:42:04 -0000 On Fri, Jan 29, 2021 at 2:21 PM Juraj Lutter wrote: > > > On 29 Jan 2021, at 22:06, Alan Somers wrote: > > > > On Fri, Jan 29, 2021 at 1:28 PM Juraj Lutter wrote: > > > > > > > On 29 Jan 2021, at 21:12, Alan Somers wrote: > > > > > > What is the plan to transition the > > > https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ > code? > > > It's not really a branch of src; it's more like an independent project. > > > Will it be getting its own repository? > > > > This is a good question. The other question is if it could be simplified > somehow, > > for use cases where users do not want/need patches and only want to > build updates for > > their running systems for regular maintenance. > > > > For users who don't need patches? Do you mean as a substitute for the > old: > > > > $ cd /usr/src > > $ svn up > > $ make buildworld > > $ make buildkernel > > > > Or by "don't need patches", do you mean building updates based on > tracking stable/12 instead of downloading the security advisory patches? I > don't think the former makes sense. For just one system, building world > and kernel by hand is much easier than using freebsd-update-build. > > Yes, I mean building updates based on tracking stable/12 (a rolling? > release, sort of). > For just one system, buildworld seems OK, but for more systems it may be a > burden. > Yeah, that could work. The updates might be very large, though. > > Have you also considered pkgbase? > I've never tried it. Last I heard it still had some rough edges. For example, if a new package were added to the base system, pkgbase wouldn't automatically install it.