Skip to content

[feat] Add unconditional includes for gitconfig #3127

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

Merged
merged 7 commits into from
Apr 19, 2025

Conversation

dominikschulz
Copy link
Member

Continuation of #2574

Thanks to @sergey-suslov for most of the work.

RELEASE_NOTES=[FEATURE] Add support for gitconfig include

Fixes #3125

@dominikschulz dominikschulz added the feature Enhancements and new features label Apr 19, 2025
@dominikschulz dominikschulz changed the title Add gitconfig unconditional includes [feat] Add gitconfig unconditional includes Apr 19, 2025
sergey-suslov and others added 6 commits April 19, 2025 14:46
feature for gopasspw#2458

RELEASE_NOTES=[FEATURE] Add support for gitconfig include

Signed-off-by: Sergei Suslov <sergey.suslov.nsk@gmail.com>
RELEASE_NOTES=n/a

Signed-off-by: Sergei Suslov <sergey.suslov.nsk@gmail.com>
We must not write the content of the merged config to the base config.

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
@dominikschulz dominikschulz changed the title [feat] Add gitconfig unconditional includes [feat] Add unconditional includes for gitconfig Apr 19, 2025
Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
@dominikschulz dominikschulz merged commit 3eb1442 into gopasspw:master Apr 19, 2025
9 checks passed
@dominikschulz dominikschulz deleted the fix/issue-3125 branch April 19, 2025 16:50
sudoforge pushed a commit to sudoforge/gopass that referenced this pull request May 20, 2025
* add gitconfig extension from include

feature for gopasspw#2458

RELEASE_NOTES=[FEATURE] Add support for gitconfig include

Signed-off-by: Sergei Suslov <sergey.suslov.nsk@gmail.com>

* use t.Setenv instead of os.Setenv, comment log

RELEASE_NOTES=n/a

Signed-off-by: Sergei Suslov <sergey.suslov.nsk@gmail.com>

* [fix] Fix writing merged configs

We must not write the content of the merged config to the base config.

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>

* [chore] Classify license

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>

* [fix] Fix lint issues and one test

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>

* [fix] Fix one failing test on Windows as a workaround

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>

* [fix] Ignore two tests on windows

Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>

---------

Signed-off-by: Sergei Suslov <sergey.suslov.nsk@gmail.com>
Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
Co-authored-by: Sergei Suslov <sergey.suslov.nsk@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature Enhancements and new features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[gitconfig] Support unconditional includes
2 participants