From 63717a621c464d5bf2d1b7c6716c61054ee60f66 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 23 Oct 2012 15:02:04 -0400 Subject: [PATCH] skip repos that are in the middle of a rebase --- .bin/r | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- 2.39.5