From e77d89eb4a86eb0baa2daddc3c5a9567111e5bc2 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 9 Nov 2017 21:23:27 -0500 Subject: [PATCH] borking merrily away --- scripts/rev_control/version_control.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index d0b9754c..61850e93 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -277,8 +277,9 @@ function do_update() #hmmm: if we could find a way to not try to track with a local branch when there's already one present, that would be swell. it's probably simple. done -# git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER -# test_or_die "git fetch" +#hmmm: well, one time it failed without the fetch. i hope that's because the fetch is actually needed and not because the whole approach is fubar. + git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER + test_or_die "git fetch" git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER test_or_die "git pull" -- 2.34.1