[lmi-commits] [lmi] master 0e3a2fe 1/3: Avoid git-checkout failures

[Greg Chicares]

branch: master
commit 0e3a2fed197f639653e2e06a46b4342186e99411
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Avoid git-checkout failures
---
 install_wx.sh       | 5 +++++
 install_wxpdfdoc.sh | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/install_wx.sh b/install_wx.sh
index 3b0af54..397f89d 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -75,6 +75,11 @@ then
     git fetch origin
 fi
 
+# Reset in case git-checkout would fail. See:
+#   https://lists.nongnu.org/archive/html/lmi/2020-07/msg00053.html
+git reset --hard
+git submodule foreach 'git reset --hard'
+
 git checkout "$wx_commit_sha"
 
 # Get any new submodules that may have been added, even if nested.
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index 11068cd..456cf3f 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -75,6 +75,10 @@ then
     git fetch origin
 fi
 
+# Reset in case git-checkout would fail. See:
+#   https://lists.nongnu.org/archive/html/lmi/2020-07/msg00053.html
+git reset --hard
+
 git checkout "$wxpdfdoc_commit_sha"
 
 build_type=$("$proxy_wxpdfdoc_dir"/admin/build-aux/config.guess)