summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
22a5805)
needed to keep branches healthy.
retval+=$?
# upload any changes to the upstream repo so others can see them.
retval+=$?
# upload any changes to the upstream repo so others can see them.
- git push 2>&1
-#| grep -v "X11 forwarding request failed"
-#have to do pipestatus if want to keep the above.
- retval+=$?
+ git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval+=${PIPESTATUS[0]}
fi
else
# nothing there. it's not an error though.
fi
else
# nothing there. it's not an error though.
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
elif [ -d ".git" ]; then
if test_writeable ".git"; then
$blatt
- git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+ retval+=${PIPESTATUS[0]}
fi
else
# this is not an error necessarily; we'll just pretend they planned this.
fi
else
# this is not an error necessarily; we'll just pretend they planned this.