dropping probably useless step

diff --git a/scripts/rev_control/diff_repo.sh b/scripts/rev_control/diff_repo.sh
deleted file mode 100644 (file)
index eb02719..0000000
--- a/scripts/rev_control/diff_repo.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# does differences on a set of folders checked out from subversion or git.
-# this can take a directory as parameter, but will default to the current
-# working directory.  all the directories under the passed directory will
-# be examined.
-
-source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
-source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
-
-##############
-
-dir="$1"; shift
-if [ -z "$dir" ]; then
-  dir=.
-fi
-
-pushd "$dir" &>/dev/null
-test_or_die "changing to directory: $dir"
-tempfile=$(generate_rev_ctrl_filelist)
-popd &>/dev/null
-
-perform_revctrl_action_on_file "$tempfile" do_diff
-test_or_die "performing revision control action do_diff on: $tempfile"
-

diff --git a/scripts/rev_control/diff_repos.sh b/scripts/rev_control/diff_repos.sh
new file mode 100644 (file)
index 0000000..eb02719
--- /dev/null
+++ b/scripts/rev_control/diff_repos.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# does differences on a set of folders checked out from subversion or git.
+# this can take a directory as parameter, but will default to the current
+# working directory.  all the directories under the passed directory will
+# be examined.
+
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
+source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh"
+
+##############
+
+dir="$1"; shift
+if [ -z "$dir" ]; then
+  dir=.
+fi
+
+pushd "$dir" &>/dev/null
+test_or_die "changing to directory: $dir"
+tempfile=$(generate_rev_ctrl_filelist)
+popd &>/dev/null
+
+perform_revctrl_action_on_file "$tempfile" do_diff
+test_or_die "performing revision control action do_diff on: $tempfile"
+

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 8f1033cfdd8bf14e4a9a1e75e2aee2e2f63a687e..f3f433d3eebd837eef27362e80cb98cf6460294b 100644 (file)
--- 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.