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)