Merge pull request #737 from smancill/standup-ensure-colors

git-standup: ensure color usage
tj · Nov 21, 2018 · a815bb0 · a815bb0
2 parents eb27b24 + 13fa83b
commit a815bb0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/bin/git-standup b/bin/git-standup
@@ -43,6 +43,7 @@ if [[ -t 1 ]] && [[ -n "$ncolors" ]] && [[ "$ncolors" -ge 8 ]] ; then
     BOLD=$(tput bold)
     UNDERLINE=$(tput smul)
     NORMAL=$(tput sgr0)
+    COLOR=always
 else
     RED=""
     GREEN=""
@@ -52,6 +53,7 @@ else
     BOLD=""
     UNDERLINE=""
     NORMAL=""
+    COLOR=never
 fi
 
 # Only enable exit-on-error after the non-critical colorization stuff,
@@ -153,6 +155,7 @@ GIT_LOG_COMMAND="git --no-pager log \
     --author=\"$AUTHOR\"
     --abbrev-commit
     --oneline
+    --color=$COLOR
     --pretty=format:'$GIT_PRETTY_FORMAT'
     --date='$GIT_DATE_FORMAT'"