Repository navigation
feat(git): fail-fast SSH and HTTP env for network fetch (PR C) #23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bschellenberger2600
wants to merge
12
commits into
cursor/run-cancel-signals-971d
Choose a base branch
from
cursor/network-failfast-env-971d
base: cursor/run-cancel-signals-971d
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
125af85
feat(git): fail-fast SSH and HTTP env for network fetch
cursoragent 0573812
Merge remote-tracking branch 'origin/cursor/run-cancel-signals-971d' …
cursoragent cf96442
fix(git): classify timeout and cancel errors after process kill
cursoragent e53c861
Merge remote-tracking branch 'origin/cursor/run-cancel-signals-971d' …
cursoragent 788ac61
Merge remote-tracking branch 'origin/cursor/run-cancel-signals-971d' …
cursoragent a299bb1
fix(git): respect GIT_SSH and isolate fail-fast env tests from global…
cursoragent d9d050b
fix(cli): remove redundant newline in skipped fetch message
cursoragent 971ef9f
Merge cursor/run-cancel-signals-971d into cursor/network-failfast-env…
cursoragent b61bc2d
Merge cursor/run-cancel-signals-971d into cursor/network-failfast-env…
cursoragent 340ca49
Merge cursor/run-cancel-signals-971d into cursor/network-failfast-env…
cursoragent bed18ab
fix(git): preserve GIT_SSH and isolate fail-fast config probes
cursoragent 8f76cb4
fix: honor cmd.Env when probing core.sshCommand
cursoragent File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package git | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "os/exec" | ||
| "strings" | ||
| ) | ||
|
|
||
| const ( | ||
| defaultSSHConnectTimeoutSec = 30 | ||
| defaultHTTPLowSpeedLimit = "1000" | ||
| defaultHTTPLowSpeedTimeSec = "30" | ||
| ) | ||
|
|
||
| func applyFailFastNetworkEnv(cmd *exec.Cmd) { | ||
| env := cmd.Env | ||
| if env == nil { | ||
| env = os.Environ() | ||
| } | ||
| env = setEnvIfUnset(env, "GIT_HTTP_LOW_SPEED_LIMIT", defaultHTTPLowSpeedLimit) | ||
| env = setEnvIfUnset(env, "GIT_HTTP_LOW_SPEED_TIME", defaultHTTPLowSpeedTimeSec) | ||
|
|
||
| // GIT_SSH_COMMAND overrides GIT_SSH; only inject when neither is set and | ||
| // core.sshCommand is unset (same preserve path as an explicit SSH wrapper). | ||
| if !envHasPrefix(env, "GIT_SSH_COMMAND=") && !envHasPrefix(env, "GIT_SSH=") && !repoHasCoreSSHCommand(cmd.Dir, env) { | ||
| sshCmd := fmt.Sprintf("ssh -o BatchMode=yes -o ConnectTimeout=%d", defaultSSHConnectTimeoutSec) | ||
| env = append(env, "GIT_SSH_COMMAND="+sshCmd) | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
Resolved
|
||
| cmd.Env = env | ||
| } | ||
|
|
||
| func setEnvIfUnset(env []string, key, value string) []string { | ||
| prefix := key + "=" | ||
| for _, e := range env { | ||
| if strings.HasPrefix(e, prefix) { | ||
| return env | ||
| } | ||
| } | ||
| return append(env, prefix+value) | ||
| } | ||
|
|
||
| func envHasPrefix(env []string, prefix string) bool { | ||
| for _, e := range env { | ||
| if strings.HasPrefix(e, prefix) { | ||
| return true | ||
| } | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func repoHasCoreSSHCommand(repoDir string, env []string) bool { | ||
| if strings.TrimSpace(repoDir) == "" { | ||
| return false | ||
| } | ||
| probe := exec.Command("git", "-C", repoDir, "config", "--get", "core.sshCommand") | ||
| probe.Env = env | ||
| out, err := probe.Output() | ||
| return err == nil && strings.TrimSpace(string(out)) != "" | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
Resolved
|
||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.