diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-03-17 03:53:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-03-17 03:53:09 +0300 |
commit | 7431379a9c5ed4006603114b1991c6c6e98d5dca (patch) | |
tree | fcc981d9556302ae47199fa9cc7c932ccd157bdc /commit.c | |
parent | ea05fd5fbf7c28200de22cf06efee3a987dc1244 (diff) | |
parent | a8cc594333848713b8e772cccf8159196ea85ede (diff) |
Merge branch 'ab/racy-hooks'
Code clean-up to allow callers of run_commit_hook() to learn if it
got "success" because the hook succeeded or because there wasn't
any hook.
* ab/racy-hooks:
hooks: fix an obscure TOCTOU "did we just run a hook?" race
merge: don't run post-hook logic on --no-verify
Diffstat (limited to 'commit.c')
-rw-r--r-- | commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1713,7 +1713,7 @@ size_t ignore_non_trailer(const char *buf, size_t len) } int run_commit_hook(int editor_is_used, const char *index_file, - const char *name, ...) + int *invoked_hook, const char *name, ...) { struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT; va_list args; |