X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Frev_control%2Fquick_git_release.sh;h=1a3ccf395999e8abb42a3986695eb84e9656bbd6;hb=db4c4e5ceeef76b11c6475f564d325f1eca72a77;hp=e0c95a249faa4d9661c452d41387930dd8cf40a2;hpb=9c2b9a67ea3c0b4613e08966e54264a085c9c416;p=feisty_meow.git

diff --git a/scripts/rev_control/quick_git_release.sh b/scripts/rev_control/quick_git_release.sh
index e0c95a24..1a3ccf39 100644
--- a/scripts/rev_control/quick_git_release.sh
+++ b/scripts/rev_control/quick_git_release.sh
@@ -40,11 +40,23 @@ branch name and release tag name of the new release.
   # make a new branch for the release based on the dev branch.
 echo about to git checkout--hit enter
 read line
+
+  # make sure we're working on the dev branch, since that's where our releases come from.
+  git checkout dev
+  exit_on_error checking out the dev branch
+
+  # inflate all the git branches we might need, getting all their latest.
+  rpuffer
+  exit_on_error running rpuffer on the dev branch to update it
+
+  # branch off our new release as its own entity.
   git checkout -b $new_release dev
   exit_on_error checking out a new branch called $new_release
+
   # bump feisty meow version. 
   bash ./scripts/generator/next_version.sh
   exit_on_error bumping version for feisty meow codebase
+
   # check in the changes in the new release branch, which now includes a revised version.
 echo about to commit--hit enter
 read line
@@ -61,6 +73,10 @@ echo about to check out master--hit enter
 read line
   git checkout master
   exit_on_error checking out master branch
+
+  rpuffer
+  exit_on_error running rpuffer on master branch to update it
+
   # merge the master branch with the new release.
 echo about to merge--hit enter
 read line
@@ -68,7 +84,7 @@ read line
   exit_on_error merging in the new release in master
   # let the committer see the most recent changes.
   echo "=> launching gitk to show you the full set of changes;"
-  echo "=> please prepare a kick-ass commit comment."
+  echo "=> please prepare an excellent commit comment."
   gitk
   exit_on_error launching gitk
   # now make a tag for the new release, which is where we should go crazy with the detailed
@@ -94,11 +110,16 @@ echo merging in from release branch to dev--hit enter
 read line
   git merge --no-ff $new_release
   exit_on_error merging the release changes into the dev branch
+echo pushing merged dev branch up
+  git push 
+  exit_on_error pushing merged dev branch up
+
+  # done with the serious actions.
+  echo -e "\ncompleted the release of version $new_version\n"
+
   # back to where we started.
   popd
 }
 
-
 make_new_feisty_meow_release "$1"
 
-