Merge branch 'nd/corrupt-worktrees' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 8a5009caf98c9ce87e794b89f398c64e61d2bb98..67f86b3e678b20ed2558ae6350b3d8138c88d28d 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.22.0-rc0
+DEF_VER=v2.22.0
 
 LF='
 '