Add --quick option to mfqp, add BRANCH check to mfinfo
This commit is contained in:
parent
c3cb449990
commit
6fe39e6117
@ -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"
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user