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:27:22 (GMT)
commit68d6eb239dd7bb950e72401643ee881fc5b327ee (patch)
tree5a63429480cdb0c8680b764b2a5301cda34a1e20
parentdcea2ab51e2a62cab9cac65ed2fd24856c685cf5 (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.
-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