Re: [yocto] [PATCH yocto-autobuilder-helper] scripts: run-docs-build: make the workdir pristine between builds

[Luca Ceresoli <luca.ceresoli@bootlin.com>]

On Mon, 3 Oct 2022 19:11:34 +0200
"Michael Opdenacker via lists.yoctoproject.org"
<michael.opdenacker=bootlin.com@lists.yoctoproject.org> wrote:

> Hi Quentin,
> 
> On 03.10.22 19:04, Quentin Schulz wrote:
> > From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> >
> > It happened that the git repositories were dirty and resulted in
> > incorrect files being used. Let's use git clean -ffdx to force a
> > completely clean git repositories before and after checking out a branch
> > so that nothing is left from or to another branch build
> >
> > Cc: Quentin Schulz <foss+yocto@0leil.net>
> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
> > ---
> >   scripts/run-docs-build | 10 +++++-----
> >   1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/scripts/run-docs-build b/scripts/run-docs-build
> > index c6b3965..69e3257 100755
> > --- a/scripts/run-docs-build
> > +++ b/scripts/run-docs-build
> > @@ -61,6 +61,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for
> >   
> >       echo Building bitbake $branch branch
> >       git checkout $branch
> > +    git clean -ffdx
> >       git checkout origin/master releases.rst
> >       make clean
> >       SPHINXOPTS="-j auto" make publish
> > @@ -80,7 +81,7 @@ for branch in 1.46 $(git branch --remote --contains "$first_sphinx_commit" --for
> >       fi
> >   
> >       cp -r ./_build/final/* $outputdir/bitbake/$branch
> > -    git reset --hard
> > +    git clean -ffdx  
> 
> 
> In both cases, why "-ffdx"? Isn't it the same as "-fdx" (just checking 
> the manual page).

The manpage for git 2.34.1 has this extra detail:

> Git will refuse to modify untracked nested git repositories
> (directories with a .git subdirectory) unless a second -f is given.

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com