On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber <git@xxxxxxxxx> wrote:
> f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07)
> introduced the no-verify to merge for bypassing the commit-msg hook,
> though in a different way from the implementation in commit.c.
>
> Change the implementation in merge.c to be the same as in merge.c so
> that both do the same in the same way.
>
> Signed-off-by: Michael J Gruber <git@xxxxxxxxx>
Thanks for spotting.
Junio spotted it as well; I assumed I had reverted it in the last
sent out (accepted) patch.
If we want to further the commit message:
This changes the output of 'git merge --help' in a way that
it suggests that the hook is on by default.
Thanks,
Stefan
> ---
> builtin/merge.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index de254d466b..7ba094ee87 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -73,7 +73,7 @@ static int show_progress = -1;
> static int default_to_upstream = 1;
> static int signoff;
> static const char *sign_commit;
> -static int verify_msg = 1;
> +static int no_verify;
>
> static struct strategy all_strategy[] = {
> { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
> @@ -237,7 +237,7 @@ static struct option builtin_merge_options[] = {
> N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
> OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
> OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
> - OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
> + OPT_BOOL(0, "no-verify", &no_verify, N_("bypass commit-msg hook")),
> OPT_END()
> };
>
> @@ -798,7 +798,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
> abort_commit(remoteheads, NULL);
> }
>
> - if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
> + if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(),
> "commit-msg",
> git_path_merge_msg(), NULL))
> abort_commit(remoteheads, NULL);
> --
> 2.14.1.909.g0fa57a0913
>
