mkgitrel: support --force for early cleaning up

diff --git a/mkgitrel b/mkgitrel
index 13685a649397d3f508071125722df662b02beb04..6b4ef1a2706aabf9a6c955ba91237fe6124a8442 100755 (executable)
--- a/mkgitrel
+++ b/mkgitrel
@@ -22,7 +22,7 @@
 # USA
 
 
-# usage: mkgitrel 5.5.5-gnu 5.4.3-gnu 5.0.111-gnu1 ...
+# usage: mkgitrel [--force] 5.5.5-gnu 5.4.3-gnu 5.0.111-gnu1 ...
 
 # This is our release engineering script.  It's very tied to our
 # internal cleaning-up repository structure, as well as to our public
@@ -35,9 +35,11 @@
 # for manual verification before preparing tags and tarballs for
 # publishing.
 
+force= && case $1 in --force) force=$1; shift;; esac
+
 $0.pre "$@" &&
 
-$0.cln "$@" &&
+$0.cln $force "$@" &&
 
 echo all revs cleaned up, awaiting manual check results... &&
 

diff --git a/mkgitrel.cln b/mkgitrel.cln
index 4dd0639a393dc580c12fe9f20d65e6b79147fa4c..85c3ad54c20da3a6f53b035c8924e8f486355dda 100755 (executable)
--- a/mkgitrel.cln
+++ b/mkgitrel.cln
@@ -24,6 +24,8 @@
 scriptdir=$(dirname "$0")
 . $scriptdir/mkgitrel.gcfg
 
+force= && case $1 in --force) force=$1; shift;; esac
+
 success=:
 for rel
 do
@@ -56,7 +58,7 @@ git worktree add --detach logs/v$rel public/logs/v$prevn &&
 
 (cd logs/v$rel && git rm -f linux-*) &&
 
-if (cd sources/v$rel && ../../scripts/v$rel/deblob-$cbr) \
+if (cd sources/v$rel && ../../scripts/v$rel/deblob-$cbr $force) \
        >& logs/v$rel/linux-libre-$rel.log; then
   :
 else
@@ -119,6 +121,11 @@ fi &&
       > linux-libre-$rel.check ||
     { success=false; continue; }; } &&
 
+if test -n "$force"; then
+  echo --force is for testing only >> linux-libre-$rel.check
+  success=false
+fi &&
+
 continue
 
 echo something went wrong > linux-libre-$rel.check