From fef951e94339667ae6d5c55dd8bc862b0f736970 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Jul 2019 10:40:07 +1000
Subject: [PATCH] do_merge: switch to using getopts

---
 do_merge | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/do_merge b/do_merge
index 01d7f1c..1c91fe5 100755
--- a/do_merge
+++ b/do_merge
@@ -3,19 +3,20 @@
 no_build=false
 start_from=""
 
-[ "$1" = "-n" ] && {
-	shift
-	no_build=true
-}
-[ "$1" = "-s" ] && {
-	shift
-	start_from="$1"
-	[ -z "$start_from" ] && {
-		echo "-s requires a start tree" 1>&2
+while getopts 'ns:' opt; do
+	case "$opt" in
+	n)
+		no_build=true
+		;;
+	s)
+		start_from="$OPTARG"
+		;;
+	*)
 		exit 1
-	}
-	shift
-}
+		;;
+	esac
+done
+shift $((OPTIND - 1))
 
 tool_dir=$(dirname "$0")
 . "$tool_dir/common.sh"
-- 
2.39.2