# use our splitter tool for lengthy output if it's available.
if [ ! -z "$(which splitter)" ]; then
TO_SPLITTER="$(which splitter)"
-
-#hmmm: another reusable chunk here, getting terminal size.
# calculate the number of columsn in the terminal.
- cols=$(stty size | awk '{print $2}')
+ cols=$(get_maxcols)
TO_SPLITTER+=" --maxcol $(($cols - 1))"
else
TO_SPLITTER=cat
{
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 @)
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
+
+ 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.
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"
- local this_branch="$(my_branch_name)"
-#appears to be useless; reports no changes when we need to know about remote changes that do exist:
-#hmmm: trying it out again now that things are better elsewhere. let's see what it says.
- state=$(check_branch_state "$this_branch")
- echo "=> branch '$this_branch' state is: $state"
+ 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.
local branch_list=$(all_branch_names)
promote_pipe_return 0
test_or_die "git switching checkout to remote branch: $bran"
- state=$(check_branch_state "$bran")
- echo "=> branch '$bran' state is: $state"
+ 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
+
+ echo "=> branch '$bran' state after pull is: $state"
fi
test_or_die "git pull of remote branch: $bran"
done