vanilla time

[feisty_meow.git] / scripts / rev_control / version_control.sh

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index a3f91e6335d844e1cf4acc44a97a6999d213b573..a0e419ea636e910c148500e6f52f478dd4c08de9 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -3,6 +3,9 @@
 # these are helper functions for doing localized revision control.
 # this script should be sourced into other scripts that use it.
 
+# Author: Chris Koeritz
+# Author: Kevin Wentworth
+
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
@@ -36,8 +39,6 @@ if [ ! -d "$TMP" ]; then
   echo "could not create the temporary directory TMP in: $TMP"
   echo "this script will not work properly without an existing TMP directory."
 fi
-#hmmm: re-address the above code, since it doesn't make a lot of sense to me right now...
-
 
 ##############
 
@@ -89,6 +90,9 @@ function do_checkin()
       # catch if the diff-index failed somehow.
       test_or_die "git diff-index"
 
+      # 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.
+
       local myself="$(my_branch_name)"
       local parent="$(parent_branch_name)"
 
@@ -268,20 +272,18 @@ function do_update()
     if test_writeable ".git"; then
       $blatt
 
-      # from very helpful page:
-      # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
-
-      for remote in $( git branch -r | grep -v -- '->' ); do
-        git branch --track ${remote#origin/} $remote 2>/dev/null
-#hmmm: ignoring errors from these, since they are continual.
-#hmmm: if we could find a way to not try to track with a local branch when there's already one present, that would be swell.  it's probably simple.
-      done
-
-      git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      test_or_die "git fetch"
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
 
-      git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      test_or_die "git pull"
+      # snag all new files.  not to everyone's liking.
+      git add --all .
+      retval=$?
+      # tell git about all the files and get a check-in comment.
+      git commit .
+      retval+=$?
+      # upload the files to the server so others can see them.
+      git push 2>&1 | grep -v "X11 forwarding request failed"
+      retval+=$?
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.