Re: [lmi] wx 'git checkout f741031e69de73d5' aborting

[Greg Chicares]

On 2019-03-23 21:37, Greg Chicares wrote:
> To reproduce on the command line

Not reproducible.

Trying again, after wiping everything away (including the chroot's
/cache_for_lmi/vcs , which I then recopied from my host system's
cache directory), everything works. Script output is the same up to:

> # Fetch desired commit from remote host if missing.
> if ! git rev-parse --quiet --verify "$wx_commit_sha^{commit}" >/dev/null
> then
>     git fetch origin
> fi
> + git rev-parse --quiet --verify 
> f741031e69de73d5816cc56e99c9beba3ac820de^{commit}
> 
> git checkout "$wx_commit_sha"
> + git checkout f741031e69de73d5816cc56e99c9beba3ac820de
> error: The following untracked working tree files would be overwritten by 
> checkout:
>       docs/doxygen/images/drawing-addarctopoint.png

Today, instead of that error, I get...

# Fetch desired commit from remote host if missing.
if ! git rev-parse --quiet --verify "$wx_commit_sha^{commit}" >/dev/null
then
    git fetch origin
fi
+ git rev-parse --quiet --verify 
f741031e69de73d5816cc56e99c9beba3ac820de^{commit}
+ git fetch origin
>From https://github.com/wxWidgets/wxWidgets
   05d932d682..3a04a45639  WX_3_0_BRANCH -> origin/WX_3_0_BRANCH
   e905b94436..8ddf484d3e  master        -> origin/master
 * [new tag]               v3.1.2        -> v3.1.2
Fetching submodule 3rdparty/catch
>From https://github.com/wxWidgets/Catch
   011f6e64..b46f260f  wx         -> origin/wx
Fetching submodule src/expat
>From https://github.com/wxWidgets/libexpat
   6b2e0e6..b99766c  wx         -> origin/wx
Fetching submodule src/png
>From https://github.com/wxWidgets/libpng
   a016282f4..772e393c7  wx         -> origin/wx
Fetching submodule src/tiff
>From https://github.com/wxWidgets/libtiff
   aa65abe0..c70cb3d7  wx         -> origin/wx

git checkout "$wx_commit_sha"
+ git checkout f741031e69de73d5816cc56e99c9beba3ac820de
Previous HEAD position was e38866d3a6 Merge branch 'lzma'
HEAD is now at f741031e69 Suppress gcc -Wfloat-conversion warning in wxFontInfo 
ctor
M       src/expat

# Get any new submodules that may have been added, even if nested.
git submodule update "$coefficiency" --recursive --init
+ git submodule update --jobs=32 --recursive --init

...and then all the rest just works.