Changes in / [2693b12:633db30]

File:

• scripts/do-release (modified) (3 diffs)

scripts/do-release

@@ -7 +7 @@
 
 force=
+no_tag=
 
-if [ "$1" = "-f" ]; then
-    force=1
-fi
+for arg; do
+    case $arg in
+        -f) force=1 ;;
+        --no-tag) no_tag=1 ;;
+    esac
+done
 
 VERS=$(perl -ne 'print $1 if m{^AC_INIT\(\[[^\]]+\],\s*\[([^\]]+)\]}' configure.ac) \
@@ -21 +25 @@
 fi
 
-if git cat-file -t "$TAG" > /dev/null 2>&1; then
-    die "Error: Object $TAG already exists."
+if ! [ "$no_tag" ]; then
+    if git cat-file -t "$TAG" > /dev/null 2>&1; then
+        die "Error: Object $TAG already exists."
+    fi
+
+    git tag -s -m "BarnOwl $VERS" "$TAG"
+else
+    TAG=HEAD
 fi
 
@@ -28 +38 @@
 for sig in 1 2 13 15; do trap "exit $(($sig + 128))" $sig; done
 trap 'exittrap' EXIT
-
-git tag -s -m "BarnOwl $VERS" "$TAG"
 
 TMPDIR=$(mktemp -d /tmp/barnowl.XXXXXX)