X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Frev_control%2Fversion_control.sh;h=6321dc14a0702a98aba52a3bd76601c5ddddc0e5;hb=95841fc6ed58f9f24c1eaee8b81c2ce1d44969b9;hp=a3f91e6335d844e1cf4acc44a97a6999d213b573;hpb=3db6ecfccb41c870dfda635f5791c58840c49994;p=feisty_meow.git

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index a3f91e63..6321dc14 100644
--- 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...
-
 
 ##############
 
@@ -76,32 +77,20 @@ function do_checkin()
   elif [ -d ".git" ]; then
     if test_writeable ".git"; then
       $blatt
+
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
       # snag all new files.  not to everyone's liking.
       git add --all .
       test_or_die "git add all new files"
-
-      # see if there are any changes in the local repository.
-      if ! git diff-index --quiet HEAD --; then
-        # tell git about all the files and get a check-in comment.
-        git commit .
-        test_or_die "git commit"
-      fi
-      # catch if the diff-index failed somehow.
-      test_or_die "git diff-index"
-
-      local myself="$(my_branch_name)"
-      local parent="$(parent_branch_name)"
-
-      # upload any changes to the upstream repo so others can see them.
-      if [ "$myself" != "$parent" ]; then
-        git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-        test_or_die "git push to origin: $myself"
-      else
-        # this branch is the same as the parent, so just push.
-        git push 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-        test_or_die "normal git push"
-      fi
-
+      # tell git about all the files and get a check-in comment.
+      git commit .
+      test_or_die "git commit"
+      # upload the files to the server so others can see them.
+      git push 2>&1 | grep -v "X11 forwarding request failed"
+      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+      test_or_die "git push"
     fi
   else
     # nothing there.  it's not an error though.
@@ -268,20 +257,13 @@ 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
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
 
-      git fetch --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-      test_or_die "git fetch"
-
-      git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
       test_or_die "git pull"
+
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.