diff --git a/.cirrus.yml b/.cirrus.yml
index c08e316c..c7123e5e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,4 +3,4 @@ freebsd_instance:
 
 task:
   install_script: pkg install -y gmake bash git
-  script: git fetch --tags && gmake check
+  script: git fetch --tags --force && gmake check
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
index d1dfe071..1f85a21c 100644
--- a/.github/actions/spelling/patterns.txt
+++ b/.github/actions/spelling/patterns.txt
@@ -1,7 +1,6 @@
 # numbers
 (?:[\\0][xX]|[uU]\+|#)[0-9a-fA-FgGrR]{2,}[uU]?[lL]{0,2}\b
 # avoid false positive
- -force$
- --force$
+ -{1,2}force\W
 # flags
 (?!\w)-{1,2}[fDW]
diff --git a/.travis.yml b/.travis.yml
index 3a1faee1..8630b810 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,7 @@ before_script: |
 script: |
   ${CC} --version
   ${CXX} --version
-  git fetch --unshallow --tags --prune || exit 1
+  git fetch --unshallow --tags --prune --force || exit 1
   if [ ! -s ./coverity_scan.sh ]; then
     make --keep-going all && MALLOC_CHECK_=7 MALLOC_PERTURB_=42 make --keep-going check
   else
diff --git a/appveyor.yml b/appveyor.yml
index 524453e7..54c0bc7d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -58,9 +58,9 @@ init:
 before_build:
 - git clean -x -f -d
 - git submodule sync
-- git fetch --tags --prune
+- git fetch --tags --prune --force
 - git submodule update --init --recursive
-- git submodule foreach --recursive git fetch --tags --prune
+- git submodule foreach --recursive git fetch --tags --prune --force
 - cmake --version
 
 build_script: