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
Add config to allow file protocol to be used-Tests #10389
Conversation
Looking into Modules: repo1 repo1/repo2 debugged and got temp path tree /A |clip
|
5fc0ee1
to
826e762
Compare
UnitTests/GitCommands.Tests/Git/Commands/GitCommandHelpersTest.cs
Outdated
Show resolved
Hide resolved
a5037db
to
985cb48
Compare
Please hold up. I am doing this methodically. I just got tests green. I am now going to play with what the different configs do. I did make this Pull request WIP for a reason. |
What user means: found at https://git-scm.com/docs/git-config#Documentation/git-config.txt-protocolallow So user basically breaks recursive submodule update --init and add.
at GitCommands.ExecutableExtensions.d__9.MoveNext() in C:\git\gitextensions\GitCommands\Git\ExecutableExtensions.cs:line 326 |
985cb48
to
b1faf06
Compare
Ok. now ready for review. |
This work will be the basis for another pull request that will define ui popup functionality based on needed ui interaction to allow command. @RussKie @gerhardol . Review this and let me know if you have feedback. This gets tests green and lays the foundation for a ui user allows x functionality built on the work here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
too tired to review...
Can you please re-enable all tests that were disabled in fe1d5b2? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1
Enable tests as Russkie suggested.
Looks fine, not much else to do I assume.
I would would prefer a string instead of the nullable configs argument in GitCommandHelpers.cs, no strong opinion.
UnitTests/GitCommands.Tests/Submodules/SubmoduleStatusProviderTests.cs
Outdated
Show resolved
Hide resolved
8266b96
to
95ace52
Compare
I'm away. I'll be able to review next week.
|
UnitTests/GitCommands.Tests/Submodules/SubmoduleStatusProviderTests.cs
Outdated
Show resolved
Hide resolved
gitextensions#10389 (comment) Co-authored-by: Michael Seibt <36601201+mstv@users.noreply.github.com>
gitextensions#10389 (comment) Co-authored-by: Michael Seibt <36601201+mstv@users.noreply.github.com>
See https://bugs.launchpad.net/ubuntu/+source/git/+bug/1993586 along with https://github.blog/2022-10-18-git-security-vulnerabilities-announced/#fn-67904-1 for details. I have tried with never, and user. Always is required and at least with git for windows even setting config in I left this code in to make sure that adding submodules still works down the road. Since we are in direct control of what the repo is and what are in the submodules for the tests, we can set always to true for tests. For the program we will need to rethink adding submodules and submodule update --recursive. Git has locked it down HARD. This pull request is ONLY concerned with making tests work again. The next pull request will be started after this is merged. That work will entail us forgoing recursive submodule work, or asking user if it trusts the repos in submodule chain and if so, we pass in the config to always. Started #10426 to discuss this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you very much for making the tests work again and for all the testing.
I tend to |
I can rebase and force push if you want. |
Should be able to just merge now. @mstv |
There is no need to manually rebase. This can be done using . We want to avoid unnecessary merge commits. I want to discuss
|
I follow the idea of atomic commits. I try to keep changes as small as possible so that reviews are easier. If you squash then it gets hairy understanding work like this. The add config is pretty big but is clear on what it is doing. So I prefer commits stay.
I can reword last commit and add a reference to pull request if you like. |
Yes, please. We can continue the generic discussion after merging. |
Next step is to get the core team to opine on #10426. This pull request started the plumbing on how to pass in the config when needed. The discussion is there for how do we want the program to act. I don't want to go down a rabbit hole and have to rework. Please discuss there and let's get a direction on the discussion and then from discussion I'll wire up the expected functionality in the gui. |
Thank you |
Fixes #10387 for tests. Will reopen issue and tie to second pull request.
Closes #10394
Proposed changes
Test methodology
Test environment(s)
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.