if ! git diff-index --quiet HEAD --; then
# tell git about all the files and get a check-in comment.
git commit .
- retval+=$?
+ let "retval = retval + $?"
fi
# catch if the diff-index failed somehow.
- retval+=$?
+ let "retval = retval + $?"
local myself="$(my_branch_name)"
local parent="$(parent_branch_name)"
# upload any changes to the upstream repo so others can see them.
if [ "$myself" != "$parent" ]; then
git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- retval+=${PIPESTATUS[0]}
+ let "retval = retval + ${PIPESTATUS[0]}"
else
# this branch is the same as the parent, so just push.
git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- retval+=${PIPESTATUS[0]}
+ let "retval = retval + ${PIPESTATUS[0]}"
fi
fi
# only update if we see a repository living there.
if [ -d ".svn" ]; then
svn diff .
- retval+=$?
+ let "retval = retval + $?"
elif [ -d ".git" ]; then
git diff
- retval+=$?
+ let "retval = retval + $?"
elif [ -d "CVS" ]; then
cvs diff .
- retval+=$?
+ let "retval = retval + $?"
fi
popd &>/dev/null
# from very helpful page:
# https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
- git branch -r | grep -v '\->' |
- while read remote; do
- git branch --track "${remote#origin/}" "$remote"
- # ensure we notice a failure when adding tracking.
- retval+=$?
- done
- retval+=${PIPESTATUS[0]}$?
+
+ for remote in $( git branch -r | grep -v -- '->' ); do
+ git branch --track ${remote#origin/} $remote
+ let "retval = retval + $?"
+ done
+
+#tiny bit hosed
+# git branch -r | grep -v -- '->' |
+# while read remote; do
+# git branch --track "${remote#origin/}" "$remote"
+# # ensure we notice a failure when adding tracking.
+# let "retval = retval + $?"
+# done
+# let "retval = retval + ${PIPESTATUS[0]}"
git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- retval+=${PIPESTATUS[0]}
+ let "retval = retval + ${PIPESTATUS[0]}"
git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
- retval+=${PIPESTATUS[0]}
+ let "retval = retval + ${PIPESTATUS[0]}"
fi
else
# this is not an error necessarily; we'll just pretend they planned this.
rm $tempfile
}
-