From 6fe39e61173f91807f5d2b5e30cf8c3f3ac86e8e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sat, 2 Feb 2019 14:03:10 -0600
Subject: [PATCH] Add --quick option to mfqp, add BRANCH check to mfinfo

---
 buildroot/share/git/mfinfo |  7 ++++---
 buildroot/share/git/mfqp   | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/buildroot/share/git/mfinfo b/buildroot/share/git/mfinfo
index 30a9872ff4..3249473b89 100755
--- a/buildroot/share/git/mfinfo
+++ b/buildroot/share/git/mfinfo
@@ -12,9 +12,6 @@
 #   - Current Branch
 #
 
-# usage() { echo "usage: `basename $0` [1|2] [branch]" 1>&2 ; }
-# [[ $# < 3 && $1 != "-h" && $1 != "--help" ]] || { usage; exit 1; }
-
 CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
 [[ -z $CURR ]] && { echo "No git repository here!" 1>&2 ; exit 1; }
 [[ $CURR == "(no"* ]] && { echo "Git is busy with merge, rebase, etc." 1>&2 ; exit 1; }
@@ -56,4 +53,8 @@ case "$REPO" in
   MarlinDocumentation ) TARG=master ;;
 esac
 
+[[ $BRANCH =~ ^[0-9]$ ]] && USAGE=1
+
+[[ $USAGE ]] && { echo "usage: `basename $0` [1|2] [branch]" 1>&2 ; exit 1 ; }
+
 echo "$ORG $FORK $REPO $TARG $BRANCH $CURR $MORE"
diff --git a/buildroot/share/git/mfqp b/buildroot/share/git/mfqp
index da4248d423..febd3c8ad3 100755
--- a/buildroot/share/git/mfqp
+++ b/buildroot/share/git/mfqp
@@ -5,14 +5,27 @@
 # Add all changed files, commit as "patch", do `mfrb` and `git push -f`
 #
 
-[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` [1|2]" 1>&2 ; exit 1; }
-
 MFINFO=$(mfinfo "$@") || exit 1
 IFS=' ' read -a INFO <<< "$MFINFO"
 REPO=${INFO[2]}
 TARG=${INFO[3]}
 CURR=${INFO[5]}
 
+IND=6
+while [ $IND -lt ${#INFO[@]} ]; do
+  ARG=${INFO[$IND]}
+  case "$ARG" in
+    -q|--quick ) QUICK="-q" ;;
+     -h|--help ) USAGE=1 ;;
+             * ) USAGE=1 ; echo "unknown option: $ARG" ;;
+  esac
+  let IND+=1
+done
+
+[[ ${INFO[4]} =~ [0-9] ]] && USAGE=1
+
+[[ $USAGE ]] && { echo "usage: `basename $0` [1|2]" 1>&2 ; exit 1 ; }
+
 git add .
 git commit -m "patch"
 
@@ -23,5 +36,5 @@ if [[ $CURR == $TARG ]]; then
     echo "Don't alter the PR Target branch."; exit 1
   fi
 else
-  mfrb "$@" && git push -f
+  mfrb $QUICK "$@" && git push -f
 fi