Thread (49 messages) flat view 49 messages, 2 authors, 2016-06-15
STALE3730d

Revision v5 of 4 in this series.

Revisions (4)
  1. v4 [diff vs current]
  2. v5 current
  3. v6 [diff vs current]
  4. v7 [diff vs current]

[PATCH v5 35/44] builtin-am: invoke pre-applypatch hook

From: Paul Tan <hidden>
Date: 2016-06-15 23:05:41
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 builtin/am.c | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/builtin/am.c b/builtin/am.c
index f856d3b..407775c 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1374,6 +1374,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.5.0.rc1.76.gf60a929
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help