[lmi] wx 'git checkout f741031e69de73d5' aborting

[Greg Chicares]

To reproduce on the command line (full output of './install_wx.sh'[0]
copied as a footnote below):

/opt/lmi/src/lmi[1]$pushd /cache_for_lmi/vcs/wxWidgets
/cache_for_lmi/vcs/wxWidgets /opt/lmi/src/lmi

/cache_for_lmi/vcs/wxWidgets[0]$git rev-parse --quiet --verify 
f741031e69de73d5816cc56e99c9beba3ac820de^{commit}
f741031e69de73d5816cc56e99c9beba3ac820de

/cache_for_lmi/vcs/wxWidgets[0]$git log -1 --oneline
e38866d3a60 (HEAD) Merge branch 'lzma'

All of that is exactly what I expect, but then:

/cache_for_lmi/vcs/wxWidgets[0]$git checkout 
f741031e69de73d5816cc56e99c9beba3ac820de
error: The following untracked working tree files would be overwritten by 
checkout:
        docs/doxygen/images/drawing-addarctopoint.png
[...snip fourteen similar lines...]
        tests/html/htmprint.cpp
Please move or remove them before you switch branches.
Aborting

/opt/lmi/src/lmi[0]$git --version
git version 2.20.1

What's the best way to address this? For now, I've edited
a local copy of 'install_wx.sh' and made this change:
  s/checkout/checkout --force/
which seems far less violent than the more popular suggestions
on stackoverflow. (Should such a change be committed to the
public repository?)

With that change, it seems to work:

git checkout --force "$wx_commit_sha"
+ git checkout --force f741031e69de73d5816cc56e99c9beba3ac820de
Previous HEAD position was e38866d3a60 Merge branch 'lzma'
HEAD is now at f741031e69d Suppress gcc -Wfloat-conversion warning in 
wxFontInfo ctor

...

 The installation of wxWidgets is finished.  On certain
 platforms (e.g. Linux) you'll now have to [...]

---------

[0] "Full output of './install_wx.sh'"

[as in lmi HEAD, but with 'prefix' modified]

[I meant to change s/i686-w64-mingw32/x86_64-w64-mingw32/ too]

# A repository is cached in /cache_for_lmi/vcs/, where it can be kept
# up to date and reused cheaply--whereas cloning it from a remote
# host takes considerable time and bandwidth, and fails if internet
# connectivity is lost, or the host is temporarily unavailable, or
# it is blocked by a corporate firewall.

# Configurable settings ########################################################

remote_host_url=${remote_host_url:-"https://github.com/wxWidgets/wxWidgets.git"}
+ remote_host_url=https://github.com/wxWidgets/wxWidgets.git

wx_commit_sha=${wx_commit_sha:-"f741031e69de73d5816cc56e99c9beba3ac820de"}
+ wx_commit_sha=f741031e69de73d5816cc56e99c9beba3ac820de

wx_skip_clean=${wx_skip_clean:-"0"}
+ wx_skip_clean=0

coefficiency=${coefficiency:-"--jobs=4"}
+ coefficiency=--jobs=32

MAKE=${MAKE:-"make $coefficiency"}
+ MAKE=make --jobs=32

# Variables that normally should be left alone #################################

mingw_dir=/MinGW_
+ mingw_dir=/MinGW_

prefix=/opt/lmi/x86_64-w64-mingw32/local
+ prefix=/opt/lmi/x86_64-w64-mingw32/local
exec_prefix="$prefix"
+ exec_prefix=/opt/lmi/x86_64-w64-mingw32/local

repo_name="wxWidgets"
+ repo_name=wxWidgets

# Script commands ##############################################################

proxy_parent_dir="/cache_for_lmi/vcs"
+ proxy_parent_dir=/cache_for_lmi/vcs
mkdir --parents "$proxy_parent_dir"
+ mkdir --parents /cache_for_lmi/vcs

proxy_wx_dir="$proxy_parent_dir"/$repo_name
+ proxy_wx_dir=/cache_for_lmi/vcs/wxWidgets

# Create a local mirror if it doesn't already exist.
if [ ! -d "$proxy_wx_dir" ]
then
    cd "$proxy_parent_dir"
    git clone "$coefficiency" --recurse-submodules "$remote_host_url" $repo_name
fi
+ [ ! -d /cache_for_lmi/vcs/wxWidgets ]

cd "$proxy_wx_dir"
+ cd /cache_for_lmi/vcs/wxWidgets

# 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
        include/wx/gtk/private/stylecontext.h
        include/wx/gtk/private/tlwgeom.h
        include/wx/gtk/private/wrapgtk.h
        include/wx/gtk1/private/addremovectrl.h
        include/wx/msw/private/tlwgeom.h
        include/wx/osx/core/cfarray.h
        include/wx/osx/core/cfdictionary.h
        include/wx/osx/core/cftype.h
        include/wx/private/tlwgeom.h
        lib/vms_gtk2.opt
        lib/vms_x11_univ.opt
        samples/Info.plist.in
        samples/aui/minimal_iphone.xcodeproj/project.pbxproj
        tests/graphics/graphpath.cpp
        tests/html/htmprint.cpp
Please move or remove them before you switch branches.
Aborting