summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Pinkham <cpinkham@mythtv.org>2011-01-19 05:27:22 (GMT)
committer Chris Pinkham <cpinkham@mythtv.org>2011-01-19 05:31:25 (GMT)
commit90fe13c948122c2e19f310d7bcfc5c6d1a8c1112 (patch)
tree325500893e4f23e158e5799d8db10d5e314e0c22
parent40df4b66c825e7148a44f47f6a940c3af90e51dc (diff)
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 68d6eb239dd7bb950e72401643ee881fc5b327ee)
-rwxr-xr-xmythtv/version.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/version.sh b/mythtv/version.sh
index 3e0b632..6f6d0cf 100755
--- a/mythtv/version.sh
+++ b/mythtv/version.sh
@@ -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