projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added pull on origin master
[feisty_meow.git]
/
scripts
/
rev_control
/
version_control.sh
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index 0c25692aee5a8cb1752a3555bc09e4e28e288d36..b19f9a420626eb7f21ae890a9c05644e2218b230 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-82,10
+82,8
@@
function do_checkin()
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.
@@
-242,8
+240,10
@@
function do_update()
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
retval=${PIPESTATUS[0]}
retval=${PIPESTATUS[0]}
+ 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.