git-rb-all: handle missing working dirs

[home.git] / .bin / git-rb-all

diff --git a/.bin/git-rb-all b/.bin/git-rb-all
index b4efb482a1887f558fffdf1f5634be4d68a3f06b..ef3f54c773596eb17cf39607052b1392f2f947e5 100755 (executable)
--- a/.bin/git-rb-all
+++ b/.bin/git-rb-all
@@ -9,7 +9,7 @@ rb_one() {
                echo " -> skipping due to missing merge branch"
        else
                echo
-               git checkout -q "${b}" || exit
+               git checkout -q "${b}" || return
                if ! git rebase ; then
                        git rebase --abort
                fi
@@ -28,10 +28,13 @@ main() {
                usage
        fi
 
+       # Switch to the top dir in case the working dir doesn't exist in every branch.
+       cd "$(git rev-parse --show-toplevel)" || return
+
        local orig b branches
        orig=$(git rev-parse --abbrev-ref HEAD) || return
 
-       branches=( $(git ls-remote . 'heads/*' | sed 's:.*refs/heads/::') )
+       branches=( $(git ls-remote --heads . | sed 's:.*refs/heads/::') )
        for b in "${branches[@]}" ; do
                rb_one "${b}"
        done