Update with upstream: part 2 #14
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
(cherry picked from commit b73c9f5)
Fixes alecthomas#105. (cherry picked from commit 8cccfa8)
(cherry picked from commit 0b7f974)
(cherry picked from commit 043e8ec)
(cherry picked from commit d5ac1f2)
(cherry picked from commit 52a760e)
(cherry picked from commit f782cbb)
(cherry picked from commit 62df01d)
…nd add missing with envar error test case (cherry picked from commit a1b275e)
(cherry picked from commit 71d9a69)
(cherry picked from commit 445c48d)
(cherry picked from commit 3b1b63e)
(cherry picked from commit b8ae8c2)
Fixes alecthomas#126. (cherry picked from commit 30de531)
(cherry picked from commit 55dccb2)
(cherry picked from commit 92b2733)
…rrorWriter() (fixes alecthomas#137) These writer functions should be preferred over .Writer(). (cherry picked from commit 9f68dc0)
codingllama
approved these changes
May 10, 2023
nklaassen
approved these changes
May 10, 2023
nklaassen
left a comment
There was a problem hiding this comment.
This and the previous PR look alright at a glance, as long as the tests pass the changes seem fine
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.
Part 2 of the upstream update #13
Conflicting commits:
18d9855:
cmd.go- upstream addedcompletionAltsand we addednoInterspersedto the sameCmdClausestruct. I accepted changes from both sides.cmd_test.go- conflict in imports, accepted both.4b73901
app.go- upstream replacedwriterwitherrorWriterandusageWriterand we addedallRepeatableto the sameApplicationstruct. I accepted changes from both sidesusage.go- upstream replacedwriterwithusageWriterand we addedformatFlagCompactfunction. I accepted changes from both sides.