From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 18:01:35 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.97^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=855636b815ea3fc6e8e3d10bb01d783475a3c6de;hp=19fade8efa1c2e717bad5e56e4c159512abfdbd4;p=feisty_meow.git

Merge branch 'dev' of feistymeow.org:feisty_meow into dev

merginx
---

diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index aacd7772..b2da8870 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -47,9 +47,8 @@ pushd "$dir" &>/dev/null
 test_or_die "changing to directory: $dir"
 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 "$(\pwd)"
+perform_revctrl_action_on_file "$tempfile" do_careful_git_update
 test_or_die "doing a careful git update on: $tempfile"
 
 # send our little boat down the stream to the dependent repository.
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 7dd199f4..de819f37 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -450,7 +450,8 @@ function perform_revctrl_action_on_file()
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
     # pass the current directory plus the remaining parameters from function invocation.
-    $action . $*
+    $action . 
+#$*
     test_or_die "performing action $action on: $(pwd)"
     sep 28
     popd &>/dev/null