Git prompt tweaks

Fix a bad test when `bash.showUntrackedFiles` isn't set.

Default `__fish_git_prompt_char_upstream_prefix` to nothing instead of a space. The bash `__git_ps1` doesn't even have an upstream prefix option, and I don't know why one was added to our `__fish_git_prompt`, but it certainly shouldn't default to a space.