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)