Fix Git sync failing when ssh config has VisualHostKey=yes#309367
Open
yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
Open
Fix Git sync failing when ssh config has VisualHostKey=yes#309367yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
yogeshwaran-c wants to merge 1 commit intomicrosoft:mainfrom
Conversation
When users set `VisualHostKey yes` in their ssh config, ssh prints an ASCII-art fingerprint to stderr on connect. Three call sites in the git extension were treating any stderr content (regardless of exit code) as a failure signal, causing `Git: Sync` to fail even though the underlying git command succeeded. Rely on the non-zero exit code already surfaced by `exec()` to detect real failures, and only use stdout content to determine success in `getDefaultBranch`, `revList`, and `revParse`. Fixes microsoft#247862
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: @lszomoruMatched files:
|
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 kind of change does this PR introduce?
Bug fix.
What is the current behavior?
When a user sets
VisualHostKey yesin their~/.ssh/config, OpenSSHprints an ASCII-art fingerprint of the remote host key to stderr on
every connect. The git extension was treating any stderr output from
certain local git commands as a failure signal, which caused
Git: Sync(and other flows) to fail even though the underlying git command
actually succeeded.
The behavior was most visible when syncing after first publishing a
branch - running the same
git push/git pullin a terminal worked,but the VS Code command surfaced an error dialog.
Fixes #247862.
What is the new behavior?
Three call sites in
extensions/git/src/git.tswere using non-emptystderras a failure signal regardless of the process exit code:getDefaultBranch(symbolic-ref)revList(rev-list)revParse(rev-parse)These now rely on the non-zero exit code already surfaced by the shared
exec()helper to detect real failures, and fall back to checkingstdoutto decide success. Any informational noise emitted on stderrby ssh (VisualHostKey output, banners, etc.) is now ignored.
Additional context
command exits non-zero (error is thrown as before).
git.ts(e.g.
checkIfMaybeRebased), which usesresult.exitCoderatherthan
result.stderrto determine success.