mg-branch-setup: Make initial push optional in mg-branch-setup

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/mg-branch-setup b/mg-branch-setup
index b0c97122e6bbe00c58243b6bd13ab238d943ebd7..d465882aafa6f2fc0b8ec7a38d0a876ac3589feb 100755 (executable)
--- a/mg-branch-setup
+++ b/mg-branch-setup
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # usage:
-#  ./mg-branch-setup BRANCH bisect INITIAL-TESTED-VERSION
+#  ./mg-branch-setup BRANCH bisect [INITIAL-TESTED-VERSION]
 #  ./mg-branch-setup BRANCH no-bisect
 #  ./mg-branch-setup BRANCH no-check
 #
@@ -33,19 +33,25 @@ mode=$1; shift
 case "$mode" in
 bisect)
        fetch=true
-       push=true
        bisect=true
-       push_version="$1"; shift
-       need_value "$push_version"
+       push=false
+       fetchbase=true
+       if [ $# != 0 ]; then
+               push=true
+               push_version="$1"; shift
+               need_value "$push_version"
+       fi
        ;;
 no-bisect)
        fetch=true
        push=false
+       fetchbase=false
        bisect=false
        ;;
 no-check)
        fetch=false
        push=false
+       fetchbase=false
        bisect=false
        ;;
 *)
@@ -83,6 +89,8 @@ fi
 
 if $push; then
        x ./ap-push $branch "$push_version"~0
+fi
+if $fetchbase; then
        x ./ap-fetch-version-baseline $branch
 fi