From e8d4f6b2fa068275db82ef20d92e499cc7253eec Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 10 Nov 2017 15:13:57 -0500 Subject: [PATCH] dropping probably useless step --- scripts/rev_control/{diff_repo.sh => diff_repos.sh} | 0 scripts/rev_control/version_control.sh | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) rename scripts/rev_control/{diff_repo.sh => diff_repos.sh} (100%) diff --git a/scripts/rev_control/diff_repo.sh b/scripts/rev_control/diff_repos.sh similarity index 100% rename from scripts/rev_control/diff_repo.sh rename to scripts/rev_control/diff_repos.sh diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 8f1033cf..f3f433d3 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -296,9 +296,10 @@ function careful_git_update() git checkout "$this_branch" test_or_die "git checking out our current branch: $this_branch" - # first update all our remote branches to their current state from the repos. - git remote update - test_or_die "git remote update" +#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. -- 2.34.1