fix: fallback to ssh if https fails and vice versa#2355
Merged
FabianKramm merged 1 commit intodevspace-sh:mainfrom Oct 3, 2022
Merged
fix: fallback to ssh if https fails and vice versa#2355FabianKramm merged 1 commit intodevspace-sh:mainfrom
FabianKramm merged 1 commit intodevspace-sh:mainfrom
Conversation
pratikjagrut
requested review from
FabianKramm and
LukasGentele
as code owners
pratikjagrut
force-pushed
the
dependency.path
branch
from
f4ca949 to
0f2c11c
Compare
lizardruss
reviewed
Sep 30, 2022
Collaborator
lizardruss
left a comment
lizardruss
left a comment
There was a problem hiding this comment.
Nice work!
I had some questions that might prompt changes, but otherwise it looks good.
pkg/util/git/git.go
Outdated
|
|
||
| args = append(args, options.Args...) | ||
| out, err := command.CombinedOutput(ctx, gr.LocalPath, expand.ListEnviron(os.Environ()...), "git", args...) | ||
| os.Setenv("GIT_SSH_COMMAND", "ssh -oBatchMode=yes") |
Collaborator
There was a problem hiding this comment.
Is this to prevent prompting for a password? If not, a comment with explanation might be helpful.
lizardruss
reviewed
Sep 30, 2022
pkg/util/git/git.go
Outdated
| } | ||
| gitEnv = append(gitEnv, os.Environ()...) | ||
| out, err := command.CombinedOutput(ctx, gr.LocalPath, expand.ListEnviron(gitEnv...), "git", args...) | ||
| os.Unsetenv("GIT_SSH_COMMAND") |
Collaborator
There was a problem hiding this comment.
Is os.Setenv() and os.Unsetenv() required, or is passing gitEnv when running the command sufficient?
Contributor
Author
There was a problem hiding this comment.
Yes, it is, I seem to misunderstand it.
pratikjagrut
force-pushed
the
dependency.path
branch
2 times, most recently
from
d883cc3 to
9d1564c
Compare
pratikjagrut
force-pushed
the
dependency.path
branch
from
9d1564c to
6afbf61
Compare
FabianKramm
approved these changes
Oct 3, 2022
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
3 participants
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 issue type does this pull request address? (keep at least one, remove the others)
/kind bugfix
What does this pull request do? Which issues does it resolve? (use
resolves #<issue_number>if possible)resolves #2323
Please provide a short message that should be published in the DevSpace release notes
Fixed an issue where DevSpace hangs till git credentials are not provided.