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