From: Josh Steadmon <steadmon@google.com> To: git@vger.kernel.org Cc: gitster@pobox.com, git@grubix.eu, martin.agren@gmail.com Subject: [PATCH v3 2/4] merge: do no-verify like commit Date: Thu, 1 Aug 2019 15:20:44 -0700 Message-ID: <89ddbf410f71bbd0dc556297913561c8492a4084.1564695893.git.steadmon@google.com> (raw) In-Reply-To: <cover.1564695892.git.steadmon@google.com> f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07) introduced the no-verify flag 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 commit.c so that both do the same in the same way. This also changes the output of "git merge --help" to be more clear that the hook return code is respected by default. [js: * reworded commit message * squashed documentation changes from original series' patch 3/4 ] Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Josh Steadmon <steadmon@google.com> --- Documentation/git-merge.txt | 2 +- Documentation/merge-options.txt | 4 ++++ builtin/merge.c | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 01fd52dc70..092529c619 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] 'git merge' (--continue | --abort | --quit) diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 79a00d2a4a..d6a9f4b96f 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -105,6 +105,10 @@ option can be used to override --squash. + With --squash, --commit is not allowed, and will fail. +--no-verify:: + This option bypasses the pre-merge and commit-msg hooks. + See also linkgit:githooks[5]. + -s <strategy>:: --strategy=<strategy>:: Use the given merge strategy; can be supplied more than diff --git a/builtin/merge.c b/builtin/merge.c index e2ccbc44e2..4425a7a12e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -81,7 +81,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 }, @@ -287,7 +287,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() }; @@ -842,7 +842,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(the_repository), NULL)) abort_commit(remoteheads, NULL); -- 2.22.0.770.g0f2c4a37fd-goog
next prev parent reply other threads:[~2019-08-01 22:20 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-22 12:04 [PATCH 0/4] pre-merge hook Michael J Gruber 2017-09-22 12:04 ` [PATCH 1/4] git-merge: Honor " Michael J Gruber 2017-09-22 19:52 ` Stefan Beller 2017-09-23 0:04 ` Martin Ågren 2017-09-22 12:04 ` [PATCH 2/4] merge: do no-verify like commit Michael J Gruber 2017-09-22 19:55 ` Stefan Beller 2017-09-22 12:04 ` [PATCH 3/4] merge: --no-verify to bypass pre-merge hook Michael J Gruber 2017-09-23 23:48 ` Junio C Hamano 2017-09-25 10:54 ` Michael J Gruber 2017-09-22 12:04 ` [PATCH 4/4] t7503: add tests for pre-merge-hook Michael J Gruber 2017-09-22 20:01 ` Stefan Beller 2017-10-02 5:54 ` [PATCH 0/4] pre-merge hook Junio C Hamano 2017-10-02 16:59 ` Stefan Beller 2017-10-17 4:05 ` Junio C Hamano 2019-07-18 22:57 ` [PATCH v2 " Josh Steadmon 2019-07-18 23:56 ` Josh Steadmon 2019-07-18 22:57 ` [PATCH v2 1/4] git-merge: Honor " Josh Steadmon 2019-07-29 20:00 ` Martin Ågren 2019-07-18 22:57 ` [PATCH v2 2/4] merge: do no-verify like commit Josh Steadmon 2019-07-18 22:57 ` [PATCH v2 3/4] merge: --no-verify to bypass pre-merge hook Josh Steadmon 2019-07-29 20:02 ` Martin Ågren 2019-07-29 23:33 ` Josh Steadmon 2019-07-18 22:57 ` [PATCH v2 4/4] t7503: add tests for pre-merge-hook Josh Steadmon 2019-07-29 20:04 ` Martin Ågren 2019-07-29 23:43 ` Josh Steadmon 2019-07-30 7:13 ` Martin Ågren 2019-07-31 18:34 ` Josh Steadmon 2019-07-29 20:09 ` [PATCH v2 0/4] pre-merge hook Martin Ågren 2019-07-29 23:29 ` Josh Steadmon 2019-07-29 20:29 ` Martin Ågren 2019-07-29 23:39 ` Josh Steadmon 2019-08-01 22:20 ` [PATCH v3 0/4] pre-merge-commit hook Josh Steadmon 2019-08-01 22:20 ` [PATCH v3 1/4] t7503: verify proper hook execution Josh Steadmon 2019-08-02 9:43 ` Martin Ågren 2019-08-01 22:20 ` Josh Steadmon [this message] 2019-08-01 22:20 ` [PATCH v3 3/4] git-merge: honor pre-merge-commit hook Josh Steadmon 2019-08-02 9:45 ` Martin Ågren 2019-08-02 22:20 ` Josh Steadmon 2019-08-01 22:20 ` [PATCH v3 4/4] merge: --no-verify to bypass " Josh Steadmon 2019-08-02 9:56 ` [PATCH v3 0/4] " Martin Ågren 2019-08-02 9:56 ` [PATCH 1/5] t7503: use "&&" in "test_when_finished" rather than ";" Martin Ågren 2019-08-02 9:56 ` [PATCH 2/5] t7503: avoid touch when mtime doesn't matter Martin Ågren 2019-08-02 9:56 ` [PATCH 3/5] t7503: simplify file-juggling Martin Ågren 2019-08-02 9:56 ` [PATCH 4/5] t7503: don't create "actual_hooks" for later appending Martin Ågren 2019-08-02 9:56 ` [PATCH 5/5] t7503: test failing merge with both hooks available Martin Ågren 2019-08-02 22:18 ` [PATCH v3 0/4] pre-merge-commit hook Josh Steadmon 2019-08-05 22:43 ` [PATCH v4 " Josh Steadmon 2019-08-05 22:43 ` [PATCH v4 1/4] t7503: verify proper hook execution Josh Steadmon 2019-08-06 18:14 ` Junio C Hamano 2019-08-07 18:11 ` Josh Steadmon 2019-08-05 22:43 ` [PATCH v4 2/4] merge: do no-verify like commit Josh Steadmon 2019-08-05 22:43 ` [PATCH v4 3/4] git-merge: honor pre-merge-commit hook Josh Steadmon 2019-08-05 22:43 ` [PATCH v4 4/4] merge: --no-verify to bypass " Josh Steadmon 2019-08-07 18:57 ` [PATCH v5 0/4] " Josh Steadmon 2019-08-07 18:57 ` [PATCH v5 1/4] t7503: verify proper hook execution Josh Steadmon 2019-08-07 18:57 ` [PATCH v5 2/4] merge: do no-verify like commit Josh Steadmon 2019-08-07 18:57 ` [PATCH v5 3/4] git-merge: honor pre-merge-commit hook Josh Steadmon 2019-08-07 18:57 ` [PATCH v5 4/4] merge: --no-verify to bypass " Josh Steadmon 2019-08-08 13:08 ` [PATCH v5 0/4] " Martin Ågren
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=89ddbf410f71bbd0dc556297913561c8492a4084.1564695893.git.steadmon@google.com \ --to=steadmon@google.com \ --cc=git@grubix.eu \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=martin.agren@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git