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

Merge branch 'master' of feistymeow.org:feisty_meow into dev

fubar borkistan
---

154c324a33c8566c9f10dae55f6cadaf30862338
diff --cc scripts/rev_control/version_control.sh
index 291789f1,0a6ee8fe..8c714ece
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@@ -91,30 -91,10 +91,31 @@@ function do_checkin(
          git commit .
          test_or_die "git commit"
        fi
 -      # 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"
++
 +#      # 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"
 +
 +      # 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)"
 +
 +      # 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
 +
      fi
    else
      # nothing there.  it's not an error though.