getting things right still

also inadvertently included the version number in our dev branch from what was going to be the release branch.

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 1c886420abb206c5016c96e492fc11de6d6bbf42..9deee76670da9f4ef4619e4566904ac7168b8a83 100644 (file)
--- 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 f33532de8ac96d71d19e2d03219efd8f8ec3e6f3..4ea5ab5322a1ba7a0fa36ca35c611fa50886a1bd 100644 (file)
--- 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