merge queue: embarking master (3f3e209) and #11067 together #11070
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
When calling `cabal update` with an empty state (empty CABAL_DIR or new machine), cabal writes out a default config file with many fields commented out to show their defaults. This suggests that the user can uncomment the field and override the default. This is wrong for fields that aren't allowed in the config file like `builddir`. This patch avoids generating a comment with `builddir` in the default config. Fix #11050.
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch master (3f3e209) and #11067 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #11067.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:#approved-reviews-by >= 2[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]check-success = Doctest Cabalcheck-neutral = Doctest Cabalcheck-skipped = Doctest Cabalcheck-success = Meta checkscheck-neutral = Meta checkscheck-skipped = Meta checkscheck-success = docs/readthedocs.org:cabalcheck-neutral = docs/readthedocs.org:cabalcheck-skipped = docs/readthedocs.org:cabalcheck-success = Validate post jobcheck-neutral = Validate post jobcheck-skipped = Validate post jobcheck-success = fourmolucheck-neutral = fourmolucheck-skipped = fourmolucheck-success = hlintcheck-neutral = hlintcheck-skipped = hlintcheck-success = Bootstrap post jobcheck-neutral = Bootstrap post jobcheck-skipped = Bootstrap post jobcheck-success = whitespacecheck-neutral = whitespacecheck-skipped = whitespacecheck-success = Check sdist post jobcheck-neutral = Check sdist post jobcheck-skipped = Check sdist post jobcheck-success = Changelogscheck-neutral = Changelogscheck-skipped = ChangelogsRequired conditions to stay in the queue:
#approved-reviews-by >= 2[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]check-success = Doctest Cabalcheck-neutral = Doctest Cabalcheck-skipped = Doctest Cabalcheck-success = Meta checkscheck-neutral = Meta checkscheck-skipped = Meta checkscheck-success = docs/readthedocs.org:cabalcheck-neutral = docs/readthedocs.org:cabalcheck-skipped = docs/readthedocs.org:cabalcheck-success = Validate post jobcheck-neutral = Validate post jobcheck-skipped = Validate post jobcheck-success = fourmolucheck-neutral = fourmolucheck-skipped = fourmolucheck-success = hlintcheck-neutral = hlintcheck-skipped = hlintcheck-success = Bootstrap post jobcheck-neutral = Bootstrap post jobcheck-skipped = Bootstrap post jobcheck-success = whitespacecheck-neutral = whitespacecheck-skipped = whitespacecheck-success = Check sdist post jobcheck-neutral = Check sdist post jobcheck-skipped = Check sdist post jobcheck-success = Changelogscheck-neutral = Changelogscheck-skipped = Changelogs