Fix git getBranch [v1.65.0]

[cdce8p]

Introduced with 6011bf7 in v1.65.0

Git getBranch will return an invalid upstreamRef if the local branch name doesn't match the upstream one.

Currently

Field
refname	refs/heads/branch
upstream:short	remote-name/remote-branch-name
upstream.name	h-name
upstream.remote	remote-name/remote-bran

New

Field	Example
upstream:short	remote-name/remote-branch-name
upstream:remotename	remote-name
upstream:remoteref	refs/heads/remote-branch-name

https://git-scm.com/docs/git-for-each-ref#Documentation/git-for-each-ref.txt-upstream

/CC: @lszomoru

[lszomoru]

@cdce8p, thank you very much for filing the issue and for submitting a pull request with the fix. I have taken a look at the pull request and while the new fields address the regression, they are only available after in git 2.16 or later. For the time being, in order to provide immediate mitigation, I have reverted the commit that introduced the regression. I will then explore a better fix leveraging some of the fields used in this pull request.

[cdce8p]

@lszomoru Sounds good to me. Thanks for handling it! Would you like to leave this PR open? My particular issue is fixed with the revert, so I don't personally wouldn't need it. Please feel free to close it otherwise.

[lszomoru]

Manually ported these changes in cb1851d factoring in the version of git.

[cdce8p]

Thanks @lszomoru! I've tested the last insider version and everything still seems to work as expected.