mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/am--no-verify'

Browse Source 
Conditionally skip the pre-applypatch and applypatch-msg hooks when
applying patches with 'git am'.

* tr/am--no-verify:
  am: allow passing --no-verify flag
This commit is contained in:
Junio C Hamano
2023-01-16 12:07:46 -08:00
parent 763f20fb4a 566902f2db
commit b242e89dff
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/am.c
View File

@ -117,6 +117,7 @@ struct am_state {
/* various operating modes and command line options */
int interactive;
int no_verify;
int threeway;
int quiet;
int signoff; /* enum signoff_type */
@ -472,10 +473,12 @@ static void am_destroy(const struct am_state *state)
*/
static int run_applypatch_msg_hook(struct am_state *state)
{
int ret;
int ret = 0;
assert(state->msg);
ret = run_hooks_l("applypatch-msg", am_path(state, "final-commit"), NULL);
if (!state->no_verify)
ret = run_hooks_l("applypatch-msg", am_path(state, "final-commit"), NULL);
if (!ret) {
FREE_AND_NULL(state->msg);
@ -1650,7 +1653,7 @@ static void do_commit(const struct am_state *state)
const char *reflog_msg, *author, *committer = NULL;
struct strbuf sb = STRBUF_INIT;
if (run_hooks("pre-applypatch"))
if (!state->no_verify && run_hooks("pre-applypatch"))
exit(1);
if (write_cache_as_tree(&tree, 0, NULL))
@ -2340,6 +2343,8 @@ int cmd_am(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT_BOOL('i', "interactive", &state.interactive,
N_("run interactively")),
OPT_BOOL('n', "no-verify", &state.no_verify,
N_("bypass pre-applypatch and applypatch-msg hooks")),
OPT_HIDDEN_BOOL('b', "binary", &binary,
N_("historical option -- no-op")),
OPT_BOOL('3', "3way", &state.threeway,