[PATCH v2] commit: Fix description of no-verify

orgads@gmail.com· Jul 26, 2016, 14:00 UTC · lore

From: Orgad Shaneh <orgads@gmail.com>

include also commit-msg hook.

This brings the short help in line with the documentation.

Signed-off-by: Orgad Shaneh <orgads@gmail.com>
---
 builtin/commit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to builtin/commit.c +1 −1

diff --git a/builtin/commit.c b/builtin/commit.c
index 163dbca..2725712 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1616,7 +1616,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
 		OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
 		OPT_BOOL('o', "only", &only, N_("commit only specified files")),
-		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit hook")),
+		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
 		OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
 		OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
 			    STATUS_FORMAT_SHORT),

-- 
2.8.1

Junio C Hamano· Jul 26, 2016, 20:44 UTC · re: orgads@gmail.com · lore

Re: [PATCH v2] commit: Fix description of no-verify

orgads@gmail.com writes:

> Subject: Re: [PATCH v2] commit: Fix description of no-verify

Following the prevailing style from "git shortlog --no-merges -100" would make it "commit: fix description of no-verify", but "fix" is too generic a word and does not convey as much information as it wastes bits ;-)

    Subject: commit: --no-verify option skips commit-msg hook, too

perhaps?

> From: Orgad Shaneh <orgads@gmail.com>
>
> include also commit-msg hook.

Then this half-sentence can go completely.

Thanks; I'll do the above myself while queuing, so there is no need to resend.

Show 13 quoted lines

> diff --git a/builtin/commit.c b/builtin/commit.c
> index 163dbca..2725712 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1616,7 +1616,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
>  		OPT_BOOL(0, "interactive", &interactive, N_("interactively add files")),
>  		OPT_BOOL('p', "patch", &patch_interactive, N_("interactively add changes")),
>  		OPT_BOOL('o', "only", &only, N_("commit only specified files")),
> -		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit hook")),
> +		OPT_BOOL('n', "no-verify", &no_verify, N_("bypass pre-commit and commit-msg hooks")),
>  		OPT_BOOL(0, "dry-run", &dry_run, N_("show what would be committed")),
>  		OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
>  			    STATUS_FORMAT_SHORT),

v2commit: Fix description of no-verify