[feat] Add conditional includes for gitconfig #3128
Merged
Conversation
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
feature for gopasspw#2458 RELEASE_NOTES=[FEATURE] Add support for gitconfig include 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>
This chnage adds conditional includes for our gitconfig. So far we only support gitdir: filters, but other conditions can be added as needed. Fixes gopasspw#3126 Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
57d6418 to
042f279
Compare
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>
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> * [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> * [fix] Fix lint issues and one test Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org> * [feat] Add conditional includes for gitconfig This chnage adds conditional includes for our gitconfig. So far we only support gitdir: filters, but other conditions can be added as needed. Fixes gopasspw#3126 Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org> * [fix] Fix one lint issue Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org> * [fix] Fix tests Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org> * [fix] Ignore one test 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
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.
[feat] Add conditional includes for gitconfig
This change adds conditional includes for our gitconfig.
So far we only support gitdir: filters, but other conditions
can be added as needed.
Fixes #3126