From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 22:32:46 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92
X-Git-Tag: 2.140.92^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-2.140.92;hp=2072733f108c8b605b24a01baa43759403b00f49;p=feisty_meow.git

Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92

updates from dev branch
---

diff --git a/_config.yml b/_config.yml
new file mode 100644
index 00000000..c50ff38d
--- /dev/null
+++ b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-merlot
\ No newline at end of file
diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh
index 910efd06..aacd7772 100644
--- a/scripts/rev_control/push_repo_downstream.sh
+++ b/scripts/rev_control/push_repo_downstream.sh
@@ -49,7 +49,7 @@ 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" do_careful_git_update "$(\pwd)"
 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 9e314d2e..7dd199f4 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -88,7 +88,7 @@ function do_checkin()
       fi
 
       # a new set of steps we have to take to make sure the branch integrity is good.
-      do_careful_git_update 
+      do_careful_git_update "$(\pwd)"
 
       # we continue on to the push, even if there were no changes this time, because
       # there could already be committed changes that haven't been pushed yet.
@@ -449,7 +449,8 @@ function perform_revctrl_action_on_file()
     did_anything=yes
     pushd "$dirname" &>/dev/null
     echo "[$(pwd)]"
-    $action .
+    # pass the current directory plus the remaining parameters from function invocation.
+    $action . $*
     test_or_die "performing action $action on: $(pwd)"
     sep 28
     popd &>/dev/null