Re: [PULL v2 00/24] testing updates (gitlab, cirrus, docker, avocado, windows)

[Daniel P . Berrangé]

On Thu, Mar 02, 2023 at 11:24:36AM +0000, Alex Bennée wrote:
> 
> Peter Maydell <peter.maydell@linaro.org> writes:
> 
> > On Wed, 1 Mar 2023 at 19:47, Alex Bennée <alex.bennee@linaro.org> wrote:
> >>
> >> From the other thread:
> >>
> >> I think the underlying config needs updating:
> >>
> >>   .git/modules/tests/fp/berkeley-testfloat-3/config
> >>
> >> I'm surprised the git config for submodules doesn't carry the metadata.
> >
> > Yeah, in my local repo that I merge stuff with that file
> > does still have a github URL:
> > url = git://github.com/cota/berkeley-testfloat-3
> >
> > So I guess my questions are:
> >  (1) why hasn't this been a problem up til now ?
> 
> Well this is the first time we've had to tweak testfloat since Emilio
> introduced it when we first added the fp tests.
> 
> >  (2) does this mean that if I merge this then everybody will
> >      need to manually go in and update this file somehow
> >      to be able to pull the updated qemu master ?
> 
> It will depend on how old their checkout is. I don't know why git does
> just honour the metadata in .git-submodules - maybe there is a command
> line stanza to reset the origin repo of submodules?

Aside from what's mention in other replies, the general "restore sanity"
option for submodules is  'git submodule deinit --all --force' which
should purge all local state / checkouts of them.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|