Marlin_Firmware/buildroot/share/git/mfrb

20 lines
485 B
Plaintext
Raw Normal View History

#!/usr/bin/env bash
#
# mfrb
#
2017-11-04 17:33:00 -05:00
# Do "git rebase -i" against the "target" branch (bugfix-1.1.x, bugfix-2.0.x, or master)
#
2018-03-01 20:41:01 -06:00
[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "Usage: `basename $0` [1|2]" 1>&2 ; exit 1; }
2017-11-04 17:33:00 -05:00
MFINFO=$(mfinfo "$@") || exit 1
2017-07-02 20:43:57 -05:00
IFS=' ' read -a INFO <<< "$MFINFO"
TARG=${INFO[3]}
2017-11-04 17:33:00 -05:00
CURR=${INFO[5]}
2017-05-05 00:46:39 -05:00
# If the branch isn't currently the PR target
2017-11-04 17:33:00 -05:00
if [[ $TARG != $CURR ]]; then
2017-05-05 00:46:39 -05:00
git fetch upstream
2017-07-02 20:43:57 -05:00
git rebase upstream/$TARG && git rebase -i upstream/$TARG
2017-05-05 00:46:39 -05:00
fi