Browse Source

Add --quick option to mfrb

Scott Lahteine 5 years ago
parent
commit
a073293b6a
1 changed files with 14 additions and 3 deletions
  1. 14
    3
      buildroot/share/git/mfrb

+ 14
- 3
buildroot/share/git/mfrb View File

5
 # Do "git rebase -i" against the "target" branch (bugfix-1.1.x, bugfix-2.0.x, or master)
5
 # Do "git rebase -i" against the "target" branch (bugfix-1.1.x, bugfix-2.0.x, or master)
6
 #
6
 #
7
 
7
 
8
-[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "Usage: `basename $0` [1|2]" 1>&2 ; exit 1; }
9
-
10
 MFINFO=$(mfinfo "$@") || exit 1
8
 MFINFO=$(mfinfo "$@") || exit 1
11
 IFS=' ' read -a INFO <<< "$MFINFO"
9
 IFS=' ' read -a INFO <<< "$MFINFO"
12
 TARG=${INFO[3]}
10
 TARG=${INFO[3]}
13
 CURR=${INFO[5]}
11
 CURR=${INFO[5]}
14
 
12
 
13
+IND=6
14
+while [ $IND -lt ${#INFO[@]} ]; do
15
+  ARG=${INFO[$IND]}
16
+  case "$ARG" in
17
+    -q|--quick ) QUICK=1 ;;
18
+     -h|--help ) USAGE=1 ;;
19
+             * ) USAGE=1 ; echo "unknown option: $ARG" ;;
20
+  esac
21
+  let IND+=1
22
+done
23
+
24
+[[ $USAGE ]] && { echo "usage: `basename $0` [1|2]" 1>&2 ; exit 1 ; }
25
+
15
 # If the branch isn't currently the PR target
26
 # If the branch isn't currently the PR target
16
 if [[ $TARG != $CURR ]]; then
27
 if [[ $TARG != $CURR ]]; then
17
-  git fetch upstream
28
+  [[ $QUICK ]] || git fetch upstream
18
   git rebase upstream/$TARG && git rebase -i upstream/$TARG
29
   git rebase upstream/$TARG && git rebase -i upstream/$TARG
19
 fi
30
 fi

Loading…
Cancel
Save