From 474703a96351f86ad8b12e6ba6279cba3b216271 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 31 Jan 2024 22:32:12 -0800 Subject: [PATCH] push-to-pull-request: Use getopts for macOS compatibility. Signed-off-by: Anders Kaseorg --- tools/push-to-pull-request | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) 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)"