From: Mike Frysinger Date: Tue, 23 Oct 2012 19:02:04 +0000 (-0400) Subject: skip repos that are in the middle of a rebase X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=63717a621c464d5bf2d1b7c6716c61054ee60f66;p=home.git skip repos that are in the middle of a rebase --- diff --git a/.bin/r b/.bin/r index e4c8399..5d49755 100755 --- a/.bin/r +++ b/.bin/r @@ -68,7 +68,7 @@ rebase) proj=${line[2]} cd "${root}/${dir}" ( - out=$(r rb all . 2>&1) + out=$(env _proj=${proj} r rb all . 2>&1) [[ -n ${out} ]] && echo "${out}" _mj_child ) & @@ -94,6 +94,11 @@ rebase) eval $(bash-colors --env) #echo "${GOOD}### ${PWD}${NORMAL}" + # Skip if rebase is in progress. + if [[ -e .git/rebase-merge/interactive ]] ; then + echo "# ${_proj}: skipping due to active rebase" + exit 1 + fi for b in ${branches} ; do #echo " ${HILITE}### $b${NORMAL}" g co -q $b || exit 1