Report UpstreamGone. #20
Conversation
UpstreamGone is set when a branch has no remote tracking reference but still has an upstream configured. This is similar to the git warning: Your branch is based on 'origin/master', but the upstream is gone. (use "git branch --unset-upstream" to fixup)
|
Reading side for posh-git is cmarcusreid/posh-git@4fa6c8c. I'll submit a PR there once this is merged and the new executable is published. |
|
@cmarcusreid, can you please update libgit to the latest release? |
|
@DoCode I've previously had some functionality issues when upgrading libgit2, so I'd like to do that separately from this change. If you could share additional details in how to setup for your scenario in #18 that'd make it easier to validate the LFS bits. Of course, please also feel free to submit a PR if you want to make the change. |
| @@ -270,6 +271,20 @@ bool Git::GetRefStatus(Git::Status& status, UniqueGitRepository& repository) | |||
| Log("Git.GetRefStatus.NoUpstream", Severity::Spam) | |||
There was a problem hiding this comment.
Could argue that this should only be logged if UpstreamGone condition isn't met.
There was a problem hiding this comment.
Hrm. I think I like it logged with the current behavior since we don't populate Upstream in this case. If we change that behavior to report the old Upstream details, I think your suggested adjustment makes sense.
| @@ -270,6 +271,20 @@ bool Git::GetRefStatus(Git::Status& status, UniqueGitRepository& repository) | |||
| Log("Git.GetRefStatus.NoUpstream", Severity::Spam) | |||
| << R"(Branch does not have a remote tracking reference. { "repositoryPath": ")" << status.RepositoryPath | |||
| << R"(", "localBranch": ")" << status.Branch << R"(" })"; | |||
|
|
|||
| auto upstreamName = git_buf{ 0 }; | |||
| result = git_branch_upstream_remote( | |||
There was a problem hiding this comment.
If I'm reading correctly, this only checks branch.{name}.remote. Git doesn't consider an upstream to be valid without branch.{name}.merge also being set.
There was a problem hiding this comment.
Seems reasonable. I'll tweak to check both. At that point I think we'll have all the information to populate the Upstream even if it's gone, so I'll adjust the log statement and I think I can revert the inversion on the posh-git change.
| << R"(Branch does not have a remote tracking reference. { "repositoryPath": ")" << status.RepositoryPath | ||
| << R"(", "localBranch": ")" << status.Branch << R"(" })"; | ||
| auto upstreamRemoteName = git_buf{ 0 }; | ||
| auto upstreamRemoteResult = git_branch_upstream_remote( |
There was a problem hiding this comment.
I don't think you need this now - git_branch_upstream_name includes a remote check.
Report UpstreamGone. Resolves #19.
UpstreamGone is set when a branch has no remote tracking reference but still has an upstream configured. This is similar to the git warning:
Your branch is based on 'origin/master', but the upstream is gone.
(use "git branch --unset-upstream" to fixup)