Johan Herland <[email protected]> writes:
> Allow users to temporarily disable the pre-commit and commit-msg hooks
> when running "git revert" or "git cherry-pick", just like they currently
> can for "git commit".
>
> The --no-verify option is added to the sequencer machinery and handled
> like the other commit-related options.
>
> This fixes the failing t7503/t7504 test cases added previously.
>
> Signed-off-by: Johan Herland <[email protected]>
> ---
> builtin/revert.c | 1 +
> sequencer.c | 7 +++++++
> sequencer.h | 1 +
> t/t7503-pre-commit-hook.sh | 4 ++--
> t/t7504-commit-msg-hook.sh | 4 ++--
> 5 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/revert.c b/builtin/revert.c
> index f9ed5bd..831c2cd 100644
> --- a/builtin/revert.c
> +++ b/builtin/revert.c
> @@ -91,6 +91,7 @@ static void parse_args(int argc, const char **argv, struct
> replay_opts *opts)
> N_("option for merge strategy"), option_parse_x),
> { OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key-id"),
> N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) ""
> },
> + OPT_BOOL('n', "no-verify", &opts->no_verify, N_("bypass
> pre-commit hook")),
I doubt we want this option to squat on '-n'; besides, it is already
taken by a more often used "--no-commit".
I thought that we added sanity checker for the options[] array to parse-options
API. I wonder why it did not kick in...
> OPT_END(),
> OPT_END(),
> OPT_END(),
> diff --git a/sequencer.c b/sequencer.c
> index 3c060e0..3d68113 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -378,6 +378,9 @@ static int run_git_commit(const char *defmsg, struct
> replay_opts *opts,
> if (opts->allow_empty_message)
> argv_array_push(&array, "--allow-empty-message");
>
> + if (opts->no_verify)
> + argv_array_push(&array, "--no-verify");
> +
> rc = run_command_v_opt(array.argv, RUN_GIT_CMD);
> argv_array_clear(&array);
> return rc;
> @@ -773,6 +776,8 @@ static int populate_opts_cb(const char *key, const char
> *value, void *data)
> opts->record_origin = git_config_bool_or_int(key, value,
> &error_flag);
> else if (!strcmp(key, "options.allow-ff"))
> opts->allow_ff = git_config_bool_or_int(key, value,
> &error_flag);
> + else if (!strcmp(key, "options.no-verify"))
> + opts->no_verify = git_config_bool_or_int(key, value,
> &error_flag);
> else if (!strcmp(key, "options.mainline"))
> opts->mainline = git_config_int(key, value);
> else if (!strcmp(key, "options.strategy"))
> @@ -944,6 +949,8 @@ static void save_opts(struct replay_opts *opts)
> git_config_set_in_file(opts_file, "options.record-origin",
> "true");
> if (opts->allow_ff)
> git_config_set_in_file(opts_file, "options.allow-ff", "true");
> + if (opts->no_verify)
> + git_config_set_in_file(opts_file, "options.no-verify", "true");
> if (opts->mainline) {
> struct strbuf buf = STRBUF_INIT;
> strbuf_addf(&buf, "%d", opts->mainline);
> diff --git a/sequencer.h b/sequencer.h
> index db43e9c..abfadc0 100644
> --- a/sequencer.h
> +++ b/sequencer.h
> @@ -34,6 +34,7 @@ struct replay_opts {
> int allow_empty;
> int allow_empty_message;
> int keep_redundant_commits;
> + int no_verify;
>
> int mainline;
>
> diff --git a/t/t7503-pre-commit-hook.sh b/t/t7503-pre-commit-hook.sh
> index adc892b..b0307f4 100755
> --- a/t/t7503-pre-commit-hook.sh
> +++ b/t/t7503-pre-commit-hook.sh
> @@ -80,13 +80,13 @@ test_expect_success '--no-verify with failing hook' '
>
> '
>
> -test_expect_failure 'revert --no-verify with failing hook' '
> +test_expect_success 'revert --no-verify with failing hook' '
>
> git revert --no-verify HEAD
>
> '
>
> -test_expect_failure 'cherry-pick --no-verify with failing hook' '
> +test_expect_success 'cherry-pick --no-verify with failing hook' '
>
> git cherry-pick --no-verify HEAD^
>
> diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
> index 4f8b9fe..e819c25 100755
> --- a/t/t7504-commit-msg-hook.sh
> +++ b/t/t7504-commit-msg-hook.sh
> @@ -138,13 +138,13 @@ test_expect_success '--no-verify with failing hook' '
>
> '
>
> -test_expect_failure 'revert --no-verify with failing hook' '
> +test_expect_success 'revert --no-verify with failing hook' '
>
> git revert --no-verify HEAD
>
> '
>
> -test_expect_failure 'cherry-pick --no-verify with failing hook' '
> +test_expect_success 'cherry-pick --no-verify with failing hook' '
>
> git cherry-pick --no-verify HEAD^
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
