From 2bc71ac15b2998f2039fcce754070bc954afa1c5 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 9 Nov 2017 17:47:26 -0500 Subject: [PATCH] added pull on origin master needed to keep branches healthy. --- scripts/rev_control/version_control.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 0c25692a..b19f9a42 100644 --- 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. - 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. @@ -242,8 +240,10 @@ function do_update() 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]} + 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. -- 2.34.1