# catch if the diff-index failed somehow.
retval+=$?
- # upload any changes to the upstream repo so others can see them.
+#push the changes to where? locally?
git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
retval+=${PIPESTATUS[0]}
+
+ # upload any changes to the upstream repo so others can see them.
+ if [ "$(git_branch_name)" != "master" ]; then
+ git push origin "$(git_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval+=${PIPESTATUS[0]}
+ fi
+
fi
else
# nothing there. it's not an error though.
fi
}
+# a helpful method that reports the git branch for the current directory's
+# git repository.
+function git_branch_name()
+{
+ echo "$(git branch | grep \* | cut -d ' ' -f2-)"
+}
+
# gets the latest versions of the assets from the upstream repository.
function do_update()
{
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
- git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
- retval=${PIPESTATUS[0]}
+ retval=0
+
+ if [ "$(git_branch_name)" != "master" ]; then
+ git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval+=${PIPESTATUS[0]}
+ fi
+
git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
retval+=${PIPESTATUS[0]}
fi