Re: [Buildroot] [External] Re: [PATCH 1/1] utils/docker-run: fix support for git-worktrees

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: "Maier,
	Brandon L                            Collins"
	<Brandon.Maier@collins.com>
Cc: Ricardo Martincoski <ricardo.martincoski@datacom.com.br>,
	"buildroot@buildroot.org" <buildroot@buildroot.org>
Subject: Re: [Buildroot] [External] Re: [PATCH 1/1] utils/docker-run: fix support for git-worktrees
Date: Mon, 31 Jul 2023 20:50:45 +0200	[thread overview]
Message-ID: <20230731185045.GB421096@scaer> (raw)
In-Reply-To: <BN0P110MB1673CD7AFBD6CF8F5D8848D3EB05A@BN0P110MB1673.NAMP110.PROD.OUTLOOK.COM>

Brandon, All,

On 2023-07-31 17:53 +0000, Maier, Brandon L                            Collins spake thusly:
> > > From: Yann E. MORIN <yann.morin.1998@free.fr>
> > > --git-common-dir was only introduced in git 2.10.0, which is most
> > > probably not available in enterprise-grade distros like RHEL (RHEL 7 is
> > > still maintained, and it is based on Fedora 19; there's only a docker
> > > image for Fedora 20, and that has git 1.9).
> > >
> > > So I've added --no-flags, that has been present since at least 1.0.0,
> > > which means that, on git versions that did not support worktrees, we'll
> > > get an empty GIT_DIR, so that's OK: it means we're in the main working
> > > copy, and thus we don't need the mount.
> > >
> > > Applied to master with those changes, thanks.
> >
> > All the changes look good to me, and verified still works on my end.
> 
> I was looking at this again, and there's a problem with one of the
> changes. If the script's working directory is not at the root of the
> repo, then the `readlink -e "$GIT_DIR"` will fail because GIT_DIR is
> relative to the root of the repo.

Ah, damned...

> My original patch had the readlink run inside the `cd $MAIN_DIR` so
> that it would resolve the absolute path correctly.

Yes, I saw that, but I forgot to carry that logic on when I added
support for older git versions that did not know about --git-common-dir

Thanks for checking this! I'll push a quick fix.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot