Skip to content
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.

Sign up for GitHub

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

Jump to bottom

caddycmd: fix caddy validate/fmt help message #4377

Merged
merged 2 commits into from
Oct 11, 2021
Merged

caddycmd: fix caddy validate/fmt help message #4377

merged 2 commits into from
Oct 11, 2021

Conversation

jimen0
Copy link
Contributor

@jimen0 jimen0 commented Oct 11, 2021 •
edited
Loading

Fixes #4376.

New output:

$ caddy validate -help
Usage of validate:
  -adapter string
    	Name of config adapter
  -config string
    	Input configuration file

@jimen0 jimen0 changed the title commandfuncs: fix caddy validate help message caddycmd: fix caddy validate help message Oct 11, 2021
@jimen0 jimen0 force-pushed the jimen0-caddy-validate-fix branch from af57a8c to 2b6b3be Compare October 11, 2021 10:39
@francislavoie
Copy link
Member

Oh, good find 👍

Do you mind also fixing "format" -> "fmt" as well? Same deal.

@francislavoie francislavoie added this to the v2.4.6 milestone Oct 11, 2021
@jimen0
Copy link
Contributor Author

jimen0 commented Oct 11, 2021

Sure @francislavoie! Would you prefer me adding a 2nd commit to this PR or amend and force-push?

@francislavoie
Copy link
Member

You can just include it in this PR as a 2nd commit. We tend to squash-merge.

@jimen0 jimen0 changed the title caddycmd: fix caddy validate help message caddycmd: fix caddy validate/fmt help message Oct 11, 2021
francislavoie
francislavoie approved these changes Oct 11, 2021
View reviewed changes
Copy link
Member

@francislavoie francislavoie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@francislavoie francislavoie merged commit be5f77e into caddyserver:master Oct 11, 2021
@jimen0 jimen0 deleted the jimen0-caddy-validate-fix branch October 11, 2021 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@francislavoie francislavoie francislavoie approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.4.6
Development

Successfully merging this pull request may close these issues.

caddycmd: caddy validate help message is wrong
2 participants
@jimen0 @francislavoie