Merge pull request #2297 from pi-hole/bugfix/locales

Fixed locale issue, do not parse for string.
This commit is contained in:
Dan Schaper 2018-07-26 16:44:52 -07:00 committed by GitHub
commit 32cf94fc74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1918,7 +1918,7 @@ get_available_branches() {
cd "${directory}" || return 1 cd "${directory}" || return 1
# Get reachable remote branches, but store STDERR as STDOUT variable # Get reachable remote branches, but store STDERR as STDOUT variable
output=$( { git remote show origin | grep 'tracked' | sed 's/tracked//;s/ //g'; } 2>&1 ) output=$( { git ls-remote --head --quiet | cut -d'/' -f3- -; } 2>&1 )
echo "$output" echo "$output"
return return
} }