Conversation
Background upstream refresh retried git fetch forever after the 5s timeout, so a macOS keychain prompt from git-credential-osxkeychain kept returning. After three consecutive timeouts, polling that remote stops. Pull stays available when the cached branch is not behind, and a successful pull, push, or fetch resumes background refresh. Fixes pingdotgg#13912
Owner
Author
|
Opened upstream. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What Changed
Background upstream refresh stops polling a remote after three consecutive
git fetchtimeouts. Silent credential-helper success is unchanged. An explicit pull, push, or fetch still runs, and a success resumes background refresh.When that stop is active and the cached branch is not behind, Git actions offer Pull (web and desktop menu, and the primary button when the branch otherwise has nothing to do; mobile overview and header do the same).
Why
GitVcsDriver.fetchRemoteForStatusfetches with a 5s timeout. On macOS, Homebrew git usescredential.helper=osxkeychain. After a git upgrade the helper can raise a Security-framework password dialog that those 5s kills before Always Allow can be stored. Failures were backed off forever (30s up to 15 minutes), so the prompt kept returning.Clearing
credential.helperon every background fetch would also drop silent keychain andgh auth git-credentialsuccess. The background env is unchanged. Explicitgit pull --ff-onlystill has no non-interactive env and a 30s timeout, so the dialog can be approved.UI Changes
Git actions show “Upstream status needs attention. Pull to refresh it.” Pull is available in that state even when the cached branch is not behind, which is what resumes the background fetch.
Checklist
Fixes pingdotgg#13912