bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Update git helper scripts

Browse Source
This commit is contained in:
Scott Lahteine
2017-11-04 17:33:00 -05:00
parent e0a6ee8da5
commit ca21367dde
5 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
buildroot/share/git/mfrb
View File

@ -2,18 +2,18 @@
#
# mfrb
#
# Do "git rebase -i" against the "target" branch (RCBugFix or dev)
# Do "git rebase -i" against the "target" branch (bugfix-1.1.x, bugfix-2.0.x, or master)
#
[[ $# == 0 ]] || { echo "Usage: `basename $0`" 1>&2 ; exit 1; }
[[ $# < 2 ]] || { echo "Usage: `basename $0` [1|2]" 1>&2 ; exit 1; }
MFINFO=$(mfinfo) || exit 1
MFINFO=$(mfinfo "$@") || exit 1
IFS=' ' read -a INFO <<< "$MFINFO"
TARG=${INFO[3]}
BRANCH=${INFO[5]}
CURR=${INFO[5]}
# If the branch isn't currently the PR target
if [[ $TARG != $BRANCH ]]; then
if [[ $TARG != $CURR ]]; then
git fetch upstream
git rebase upstream/$TARG && git rebase -i upstream/$TARG
fi