CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --quick option to mfqp, add BRANCH check to mfinfo

Browse Source
This commit is contained in:
Scott Lahteine 2019-02-02 14:03:10 -06:00
parent c3cb449990
commit 6fe39e6117
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
buildroot/share/git/mfinfo
View File

@ -12,9 +12,6 @@
# - Current Branch # - 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') CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
[[ -z $CURR ]] && { echo "No git repository here!" 1>&2 ; exit 1; } [[ -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; } [[ $CURR == "(no"* ]] && { echo "Git is busy with merge, rebase, etc." 1>&2 ; exit 1; }
@ -56,4 +53,8 @@ case "$REPO" in
MarlinDocumentation ) TARG=master ;; MarlinDocumentation ) TARG=master ;;
esac 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" echo "$ORG $FORK $REPO $TARG $BRANCH $CURR $MORE"

19
buildroot/share/git/mfqp
View File

@ -5,14 +5,27 @@
# Add all changed files, commit as "patch", do `mfrb` and `git push -f` # 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 MFINFO=$(mfinfo "$@") || exit 1
IFS=' ' read -a INFO <<< "$MFINFO" IFS=' ' read -a INFO <<< "$MFINFO"
REPO=${INFO[2]} REPO=${INFO[2]}
TARG=${INFO[3]} TARG=${INFO[3]}
CURR=${INFO[5]} 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 add .
git commit -m "patch" git commit -m "patch"
@ -23,5 +36,5 @@ if [[ $CURR == $TARG ]]; then
echo "Don't alter the PR Target branch."; exit 1 echo "Don't alter the PR Target branch."; exit 1
fi fi
else else
mfrb "$@" && git push -f mfrb $QUICK "$@" && git push -f
fi fi