export MAX_DEPTH=5
# use our splitter tool for lengthy output if it's available.
-if [ ! -z "$(which splitter 2>/dev/null)" ]; then
- TO_SPLITTER="$(which splitter)"
+if [ ! -z "$(whichable splitter)" ]; then
+ TO_SPLITTER="$(whichable splitter)"
# calculate the number of columsn in the terminal.
cols=$(get_maxcols)
TO_SPLITTER+=" --maxcol $(($cols - 1))"
svn diff .
exit_on_error "subversion diff"
elif [ -d ".git" ]; then
- git diff
+ git --no-pager diff
exit_on_error "git diff"
elif [ -d "CVS" ]; then
cvs diff .
local to_return=120 # unknown issue.
- local local_branch=$(git rev-parse @)
+ local local_branch=$(git rev-parse HEAD)
local remote_branch=$(git rev-parse "$branch")
- local merge_base=$(git merge-base @ "$branch")
+ local merge_base=$(git merge-base HEAD "$branch")
local to_echo=
if [ "$local_branch" == "$remote_branch" ]; then
# now pull down any changes in our own origin in the repo, to stay in synch
# with any changes from others.
- git pull --tags --all | $TO_SPLITTER
+ git fetch --tags --all | $TO_SPLITTER
#is the above really important when we did this branch already in the loop?
#it does an --all, but is that effective or different? should we be doing that in above loop?
promote_pipe_return 0