Merge branch 'hotfix/unittests' of https://github.com/cbandera/git-radar

Merge pending pull request #67 of upstream git-radar project from user
cbandera.  They write:

        This is a pull request to fix issue #38. As it turns out, some built in
        commands behave differently on Mac OS X and Linux.

        In order to run the tests on Linux, I have added switch statements at
        some points to call the functions with the respective syntax.

        Also I realized, that the tests only worked for me when I set the
        following options:

                git config --global push.default simple
                git config --global branch.autosetuprebase never

        But that's probably just because these should be the defaults. I
        normally have them set to something else...

1 files changed, 6 insertions, 5 deletions

diff --git a/test-colors.sh b/test-colors.sh
index 927dab3..6243c8f 100755
--- a/test-colors.sh
+++ b/test-colors.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 scriptDir="$(cd "$(dirname "$0")"; pwd)"
 
 source "$scriptDir/radar-base.sh"
@@ -296,7 +297,7 @@ test_bash_colors_local() {
   assertEquals "$expected" "$(color_local_commits)"
 
   git push --quiet >/dev/null
-  git reset --hard head^ --quiet >/dev/null
+  git reset --hard HEAD^ --quiet >/dev/null
 
   printf -v expected "1\x01local-behind\x02↓\x01local-reset\x02"
   assertEquals "$expected" "$(bash_color_local_commits)"
@@ -340,7 +341,7 @@ test_zsh_colors_local() {
   assertEquals "1%{local-ahead%}↑%{local-reset%}" "$(zsh_color_local_commits)"
 
   git push --quiet >/dev/null
-  git reset --hard head^ --quiet >/dev/null
+  git reset --hard HEAD^ --quiet >/dev/null
 
   assertEquals "1%{local-behind%}↓%{local-reset%}" "$(zsh_color_local_commits)"
 
@@ -376,7 +377,7 @@ test_bash_colors_remote() {
   git push --quiet -u origin master >/dev/null
   repoLocation="$(pwd)"
 
-  git reset --hard head^ --quiet >/dev/null
+  git reset --hard HEAD^ --quiet >/dev/null
   git checkout -b mybranch --quiet
   git push --quiet -u origin mybranch >/dev/null
 
@@ -387,7 +388,7 @@ test_bash_colors_remote() {
   echo "bar" > bar
   git add .
   git commit -m "new commit" --quiet
-  git push --quiet >/dev/null
+  git push --quiet origin mybranch  >/dev/null
 
   printf -v expected "m 1 \x01remote-diverged\x02⇄\x01remote-reset\x02 1"
   assertEquals "$expected" "$(bash_color_remote_commits)"
@@ -426,7 +427,7 @@ test_zsh_colors_remote() {
   git push --quiet -u origin master >/dev/null
   repoLocation="$(pwd)"
 
-  git reset --hard head^ --quiet >/dev/null
+  git reset --hard HEAD^ --quiet >/dev/null
   git checkout -b mybranch --quiet
   git push --quiet -u origin mybranch >/dev/null