Fix parse_git_dirty() when status.branch is set.

[simonbuchan]

Also some cleanups.

[ncanceill]

Seems legit to me, but needs a bit more testing before I pull it into #2790 — by the way, please send your git plugin PRs directly to me instead of upstream, it allows me to cleanly aggregate them.

@mcornella @kipanshi @Kriechi can you please have a look?

[mcornella]

Basically this PR does 3 things:

• change git status command from -s (short-format) to --porcelain, which is script-compatible.
• change git_compare_version(), presumably because it didn't work correctly (I recall seeing and discussing this somewhere else)
• clean up flags and variables and such

The cleanup is correct and doesn't need testing, but the other 2 do need testing. I'll try to find the issue regarding version comparing: #2386 (specifically LFDM@02f9513); and see if parse_git_dirty works with various cases.

Also, notice that this modifies lib/git.zsh instead of the git plugin.

[simonbuchan]

Thanks for comments, guys. Sorry for mixing a bit too much in here (PR title should be "Fixes for parse_git_dirty()"?)

@mcornella : You are saying this is merging to the correct place? I did assume lib/ stuff should be to the base repo, though I was surprised that the git_* GIT_* definitions were not in the git plugin myself.

[simonbuchan]

Closing in favor of #2386, which I can start testing with (and get mergable)

[simonbuchan]

Reopening on @mcornella's recommendation in #3127 (and this is the last time I open a PR from master 😦)

[mcornella]

/cc @robbyrussell: works perfectly and solves #3126

[c10l]

Looks good to me! 👍