+ local branch="$1"; shift
+
+ if [ -z "$branch" ]; then
+ echo "No branch was passed to check branch state."
+ return 1
+ fi
+
+ local to_return=120 # unknown issue.
+
+ local local_branch=$(git rev-parse @)
+ local remote_branch=$(git rev-parse "$branch")
+ local merge_base=$(git merge-base @ "$branch")
+
+ local to_echo=
+ if [ "$local_branch" == "$remote_branch" ]; then
+ to_echo="okay"
+ elif [ "$local_branch" == "$merge_base" ]; then
+ to_echo="needs_pull"
+ elif [ "$remote_branch" == "$merge_base" ]; then
+ to_echo="needs_push"
+ else
+ to_echo="diverged"
+ fi
+
+ echo -n "$to_echo"
+
+ return $to_return
+}
+
+# only shows the branch state if it's not okay.
+# note that this is not the same as a conditional branch (ha ha).
+function show_branch_conditionally()
+{
+ local this_branch="$1"; shift
+
+ local state=$(check_branch_state "$this_branch")
+ if [ "$state" != "okay" ]; then
+ echo "=> branch '$this_branch' state is not clean: $state"
+ fi
+}
+
+# the git update process just gets more and more complex when you bring in
+# branches, so we've moved this here to avoid having a ton of code in the
+# other methods.
+function do_careful_git_update()
+{
+ local directory="$1"; shift
+ pushd "$directory" &>/dev/null
+ test_or_die "changing to directory: $directory"
+
+ if [ ! -d ".git" ]; then
+ # we ignore if they're jumping into a non-useful folder, but also tell them.
+ echo "Directory is not a git repository: $directory"
+ return 0
+ fi
+
+ local this_branch="$(my_branch_name)"
+
+ show_branch_conditionally "$this_branch"
+
+ # first update all our remote branches to their current state from the repos.
+ git remote update | $TO_SPLITTER
+ promote_pipe_return 0
+ test_or_die "git remote update"
+
+ show_branch_conditionally "$this_branch"
+
+ # this code is now doing what i have to do when i repair the repo. and it seems to be good so far.
+ # note that we allow the local branch to be merged with its remote counterpart; otherwise we would
+ # miss changes that happened elsewhere which should be seen in our local copy.
+ local branch_list=$(all_branch_names)
+ local bran
+ for bran in $branch_list; do
+# echo "synchronizing remote branch: $bran"
+ git checkout "$bran" | $TO_SPLITTER
+ promote_pipe_return 0
+ test_or_die "git switching checkout to remote branch: $bran"
+
+ show_branch_conditionally "$this_branch"
+
+ remote_branch_info=$(git ls-remote --heads origin $bran 2>/dev/null)
+ if [ ! -z "$remote_branch_info" ]; then
+ # we are pretty sure the remote branch does exist.
+ git pull --no-ff origin "$bran" | $TO_SPLITTER
+ promote_pipe_return 0
+ fi
+ test_or_die "git pull of remote branch: $bran"
+ done
+ # now switch back to our branch.
+ git checkout "$this_branch" | $TO_SPLITTER
+ promote_pipe_return 0
+ test_or_die "git checking out our current branch: $this_branch"
+
+ # now pull down any changes in our own origin in the repo, to stay in synch
+ # with any changes from others.
+ git pull --no-ff --all | $TO_SPLITTER
+ promote_pipe_return 0
+ test_or_die "git pulling all upstream"
+
+ popd &>/dev/null