Permalink
Browse files

Use --no-color when checking the git branch.

Add --no-color when checking the git branch to fix and issue when
users have "branch = always" in their .gitconfig file.  This was
causing color escape sequences to show up in the branch string
in version.cpp.

Thanks to Bill Meek for tracking down the issue which manifested
itself in the theme chooser not being able to download themes
for some users running master.

(cherry picked from commit 68d6eb2)
  • Loading branch information...
1 parent 40df4b6 commit 90fe13c948122c2e19f310d7bcfc5c6d1a8c1112 @cpinkham cpinkham committed Jan 19, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 mythtv/version.sh
View
@@ -31,7 +31,7 @@ case "${SOURCE_VERSION}" in
fi
;;
*)
- BRANCH=$(git branch | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/')
+ BRANCH=$(git branch --no-color | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/')
;;
esac

0 comments on commit 90fe13c

Please sign in to comment.