From ce306c8f6fa7a3372cd640c0e6b66aaa3d0602af Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 10 Nov 2017 15:16:44 -0500 Subject: [PATCH] another try at the totally right steps --- scripts/rev_control/version_control.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index f3f433d3..efda5948 100644 --- 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)" +#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=$? @@ -296,11 +302,6 @@ function careful_git_update() 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 -- 2.34.1