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:
e8d4f6b
)
another try at the totally right steps
author
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 20:16:44 +0000
(15:16 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 20:16:44 +0000
(15:16 -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 f3f433d3eebd837eef27362e80cb98cf6460294b..efda594872aec436582caedc33719782f0af0520 100644
(file)
--- a/
scripts/rev_control/version_control.sh
+++ b/
scripts/rev_control/version_control.sh
@@
-276,6
+276,12
@@
function careful_git_update()
{
local this_branch="$(my_branch_name)"
{
local this_branch="$(my_branch_name)"
+#this step didn't help before, and it seems redundant now.
+#hmmm, maybe it is needed. and people did seem to want it first, so trying that.
+ # first update all our remote branches to their current state from the repos.
+ git remote update
+ test_or_die "git remote update"
+
#appears to be useless; reports no changes when we need to know about remote changes that do exist:
# check_branch_state "$this_branch"
# state=$?
#appears to be useless; reports no changes when we need to know about remote changes that do exist:
# check_branch_state "$this_branch"
# state=$?
@@
-296,11
+302,6
@@
function careful_git_update()
git checkout "$this_branch"
test_or_die "git checking out our current branch: $this_branch"
git checkout "$this_branch"
test_or_die "git checking out our current branch: $this_branch"
-#this step didn't help before, and it seems redundant now.
-# # first update all our remote branches to their current state from the repos.
-# git remote update
-# test_or_die "git remote update"
-
# now pull down any changes in our own origin in the repo, to stay in synch
# with any changes from others.
git pull --no-ff --all
# now pull down any changes in our own origin in the repo, to stay in synch
# with any changes from others.
git pull --no-ff --all