DEFAULT_WORKDIR=/Users/parmentelat/git/sfa-flab-sync
UPSTREAMREPO=ssh://thierry@git.onelab.eu/git/sfa.git
FLABREPO=ssh://thierry@git.f-lab.fr/git/sfa.git
-TOTRACK="generic senslab"
AGAINST=master
GIT_OPTIONS=""
run git checkout master
msg pulling master from upstream/onelab
run git pull $GIT_OPTIONS $UPSTREAMREPO refs/heads/master:refs/heads/master
- msg pushing master to flab
- run git push $GIT_OPTIONS $FLABREPO refs/heads/master:refs/heads/master
+ if [ -n "$PUSH_MASTER" ] ; then
+ msg pushing master to flab
+ run git push $GIT_OPTIONS $FLABREPO refs/heads/master:refs/heads/master
+ fi
[ -n "$MASTER_ONLY" ] && return
# manage our branches: merge master into generic and generic into senslab
- for merge in master:generic generic:senslab; do
+ for merge in master:generic master:senslab2; do
what=$(echo $merge | cut -d: -f1)
where=$(echo $merge | cut -d: -f2)
runcd $WORKDIR
msg locally merging $what in $where
run git merge $GIT_OPTIONS $what
# push back
- msg pushing back $where onto flab
- run git push $GIT_OPTIONS $FLABREPO refs/heads/$where:refs/heads/$where
+ msg Avoiding the push back for now, run manually if needed
+ msg git push $GIT_OPTIONS $FLABREPO refs/heads/$where:refs/heads/$where
+ #msg pushing back $where onto flab
+ #run git push $GIT_OPTIONS $FLABREPO refs/heads/$where:refs/heads/$where
done
}
echo " please use a *dedicated* space"
echo " -r : restart from a fresh workdir"
echo " -m : master only"
+ echo " -s : skip master push"
echo " -i : interactive"
echo " -n : dry-run"
echo " -v : verbose"
exit 1
}
+PUSH_MASTER=true
function main () {
- while getopts "d:rminv" opt; do
+ while getopts "d:rmsinv" opt; do
case $opt in
d) WORKDIR=$OPTARG; shift ;;
r) RESTART_FROM_SCRATCH=true ;;
m) MASTER_ONLY=true ;;
+ s) PUSH_MASTER=;;
i) INTERACTIVE=true ;;
n) GIT_OPTIONS="$GIT_OPTIONS -n" ;;
v) set -x ; GIT_OPTIONS="$GIT_OPTIONS -v" ;;