From 6c24c5c0a5f761f698f61a7a2c84d26a3589ef6b Mon Sep 17 00:00:00 2001 From: Paul Tan Date: Tue, 4 Aug 2015 21:51:57 +0800 Subject: [PATCH] builtin-am: invoke pre-applypatch hook Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am.sg will invoke the pre-applypatch hook after applying the patch to the index, but before a commit is made. Should the hook exit with a non-zero status, git am will exit. Re-implement this in builtin/am.c. Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano --- builtin/am.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/am.c b/builtin/am.c index f0e3aab9af..7a7da943a3 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1334,6 +1334,9 @@ static void do_commit(const struct am_state *state) const char *reflog_msg, *author; struct strbuf sb = STRBUF_INIT; + if (run_hook_le(NULL, "pre-applypatch", NULL)) + exit(1); + if (write_cache_as_tree(tree, 0, NULL)) die(_("git write-tree failed to write a tree")); -- 2.47.1