projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b902d8
)
borking merrily away
author
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 02:23:27 +0000
(21:23 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 02:23:27 +0000
(21:23 -0500)
scripts/rev_control/version_control.sh
patch
|
blob
|
history
diff --git
a/scripts/rev_control/version_control.sh
b/scripts/rev_control/version_control.sh
index d0b9754c1a7c04e9d7705733ea66a4911c33eba0..61850e93b8dc951c7fb12f85d133677f5aed9717 100644
(file)
--- 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
#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"
git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
test_or_die "git pull"