Date: Wed, 27 Jan 2021 08:24:45 +0100 From: Milan Obuch <freebsd-git@dino.sk> To: Mark Millard <marklmi@yahoo.com> Cc: freebsd-git@freebsd.org Subject: Re: git setup/usage question Message-ID: <20210127082445.2ff4ca6a@zeta.dino.sk> In-Reply-To: <A448C932-50C3-4E93-B4CA-8A770C9876DE@yahoo.com> References: <CCD9FAB7-7075-43F8-989B-78CC14091913.ref@yahoo.com> <CCD9FAB7-7075-43F8-989B-78CC14091913@yahoo.com> <20210126231347.0d7c5a77@zeta.dino.sk> <A448C932-50C3-4E93-B4CA-8A770C9876DE@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 26 Jan 2021 15:15:22 -0800, Mark Millard <marklmi@yahoo.com> wrote: > On 2021-Jan-26, at 14:13, Milan Obuch <freebsd-git at dino.sk> wrote: > > > On Tue, 26 Jan 2021 12:51:43 -0800, Mark Millard <marklmi at > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210127082445.2ff4ca6a>