Skip to content

Commit 68d6eb2

Browse files
committed
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.
1 parent dcea2ab commit 68d6eb2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mythtv/version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ case "${SOURCE_VERSION}" in
3131
fi
3232
;;
3333
*)
34-
BRANCH=$(git branch | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/')
34+
BRANCH=$(git branch --no-color | sed -e '/^[^\*]/d' -e 's/^\* //' -e 's/(no branch)/exported/')
3535
;;
3636
esac
3737

0 commit comments

Comments
 (0)