From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 18 May 2018 22:35:59 +0000 (-0400)
Subject: the step backwards for our two forward
X-Git-Tag: 2.140.112^2~30
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b449dfc22782fad12c7f3c41e8433cec0c5cdd09;p=feisty_meow.git

the step backwards for our two forward

had to not use puff_out_list; that is the wrong method.  but got the behavior i wanted by plugging in the correct methods.
---

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 991a3251..d65c2f45 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -48,9 +48,8 @@ test_or_die "changing to directory: $dir"
 tempfile=$(generate_rev_ctrl_filelist)
 test_or_die "generating revision control file list"
 
-#perform_revctrl_action_on_file "$tempfile" do_careful_git_update
-perform_revctrl_action_on_file "$tempfile" puff_out_list
-test_or_die "doing a careful git update on: $tempfile"
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
+test_or_die "doing a careful update on: $tempfile"
 
 # seems to be needed to cause a merge to be resolved.
 git pull downstream master
diff --git a/scripts/rev_control/rpuffer.sh b/scripts/rev_control/rpuffer.sh
index c31fcb64..5032bc12 100644
--- a/scripts/rev_control/rpuffer.sh
+++ b/scripts/rev_control/rpuffer.sh
@@ -24,7 +24,6 @@ tempfile=$(generate_rev_ctrl_filelist)
 test_or_die "generating revision control file list"
 popd &>/dev/null
 
-#perform_revctrl_action_on_file "$tempfile" do_careful_git_update
-perform_revctrl_action_on_file "$tempfile" puff_out_list
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
 test_or_die "puffing out repository at: $tempfile"
 
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index b96bcb34..0c7ac401 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -243,7 +243,10 @@ function checkin_list()
   restore_terminal_title
 }
 
-# does a careful git update on all the folders in the specified list.
+# does a careful update on all the folders in the specified list;
+# it looks in the REPOSITORY_LIST for those names and updates them.
+# this is just like checkout_list, but it's for the puffing up action
+# we need to do on git.
 function puff_out_list()
 {
   # make the list of directories unique.
@@ -379,9 +382,15 @@ function do_careful_git_update()
   test_or_die "changing to directory: $directory"
 
   if [ ! -d ".git" ]; then
-    # we ignore if they're jumping into a non-useful folder, but also tell them.
-    echo "Directory is not a git repository: $directory"
-    return 0
+
+#    # we ignore if they're jumping into a non-useful folder, but also tell them.
+#    echo "Directory is not a git repository: $directory"
+#    return 0
+
+    # new and better approach; just boil down to a getem action.
+    popd &>/dev/null
+    do_update $directory
+    return $?
   fi
 
   local this_branch="$(my_branch_name)"