Skip to content

Commit

Permalink
Use --no-color when checking the git branch.
Browse files Browse the repository at this point in the history
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
cpinkham committed Jan 19, 2011
1 parent 40df4b6 commit 90fe13c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mythtv/version.sh
Expand Up @@ -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

Expand Down

0 comments on commit 90fe13c

Please sign in to comment.