From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 19:29:08 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.91
X-Git-Tag: 2.140.91^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e4da0f3a984df2f3145e3f59ef78caece7f19d91;hp=dd74823e9ff7b8b8cdfb709211f06d3e95bcdc83;p=feisty_meow.git

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

getting things snacky
---

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 1c886420..9deee766 100644
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=90
+revision=91
 build=420
 
 # specifies the remainder of the version record info.
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index f33532de..4ea5ab53 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -94,7 +94,7 @@ function do_checkin()
       # there could already be committed changes that haven't been pushed yet.
 
       # upload any changes to the upstream repo so others can see them.
-      git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      git push origin "$(my_branch_name)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
       test_or_die "git push"
 
     fi
@@ -336,7 +336,7 @@ function do_update()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
-      git pull --no-ff origin 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      git pull --no-ff 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
       if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
       test_or_die "git pull of origin without fast forwards"
     fi