diff --git a/tools/push-to-pull-request b/tools/push-to-pull-request
index d0ed09bbd1..38e584ed2b 100755
--- a/tools/push-to-pull-request
+++ b/tools/push-to-pull-request
@@ -26,28 +26,34 @@ See also \`reset-to-pull-request\`.
 EOF
 }
 
-args="$(getopt -o '' --long help,merge -n "$0" -- "$@")"
-eval "set -- $args"
-
 merge=
 
-while true; do
-    case "$1" in
-        --help)
-            usage
-            exit 0
+while getopts ":-:" opt; do
+    case $opt in
+        -)
+            case "$OPTARG" in
+                help)
+                    usage
+                    exit 0
+                    ;;
+                merge)
+                    merge=t
+                    ;;
+                *)
+                    echo "Invalid option: --$OPTARG" >&2
+                    exit 1
+                    ;;
+            esac
             ;;
-        --merge)
-            merge=t
-            shift
-            ;;
-        --)
-            shift
-            break
+        \?)
+            echo "Invalid option: -$OPTARG" >&2
+            exit 1
             ;;
     esac
 done
 
+shift $((OPTIND - 1))
+
 remote_default="$(git config zulip.zulipRemote || echo upstream)"
 pseudo_remote="$(git config zulip.prPseudoRemote || echo)"