Remove '--amend' from release script

do-release.bash

@@ -5,7 +5,7 @@ if [[ "$DEBUG" == 1 ]]; then
 fi
 
 usage() {
-  echo "usage: $0 <release-version> [--amend] [--force] [--dry-run]"
+  echo "usage: $0 <release-version> [--force] [--dry-run]"
   exit 1
 }
 
@@ -18,7 +18,6 @@ COMMIT_FLAGS=""
 TAG_FLAGS=""
 PUSH_FLAGS=""
 NO_DIRTY=1
-AMEND=0
 shift
 
 for arg; do
@@ -33,13 +32,6 @@ for arg; do
       PUSH_FLAGS="$PUSH_FLAGS --dry-run"
       ;;
 
-    --amend)
-      COMMIT_FLAGS="$COMMIT_FLAGS --amend"
-      TAG_FLAGS="$TAG_FLAGS --force"
-      PUSH_FLAGS="$PUSH_FLAGS --force"
-      AMEND=1
-      ;;
-
     *)
       usage
       ;;
@@ -53,11 +45,6 @@ fi
 
 set -e
 
-if [[ "$AMEND" == "1" ]] && ! git show -s --format=%B | grep --quiet "^LATEST_"; then
-  echo "can only amend release commit"
-  exit 1
-fi
-
 echo "Edit changeset:"
 if which editor &>/dev/null; then
   editor RELEASE.md
@@ -79,11 +66,8 @@ git commit -m "Update RELEASE.md for $RELEASE"
 echo "Creating tag..."
 git add Makefile.versions.mk
 
-echo "Creating temporary branch..."
-git checkout $(git rev-parse HEAD) >/dev/null
-
 echo "Committing $RELEASE..."
-cat <<EOF | git commit $COMMIT_FLAGS -F -
+cat <<EOF | git tag -a $TAG_FLAGS -F -
 v$RELEASE
 
 $(cat Makefile.versions.mk)
@@ -96,6 +80,6 @@ git checkout "master"
 
 echo "Pushing..."
 git push origin "$RELEASE" $PUSH_FLAGS
-git push origin master
+git push origin master $PUSH_FLAGS
 
 echo "Done."