undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hooks: convert non-worktree 'post-checkout' hook to hook library

Browse Source 
Move the running of the 'post-checkout' hook away from run-command.h
to the new hook.h library, except in the case of
builtin/worktree.c. That special-case will be handled in a subsequent
commit.

Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Emily Shaffer 2021-12-22 04:59:35 +01:00 committed by Junio C Hamano
parent 67ad630617
commit 72ddf34d7c
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/checkout.c
View File

@ -9,6 +9,7 @@
#include "config.h" #include "config.h"
#include "diff.h" #include "diff.h"
#include "dir.h" #include "dir.h"
#include "hook.h"
#include "ll-merge.h" #include "ll-merge.h"
#include "lockfile.h" #include "lockfile.h"
#include "merge-recursive.h" #include "merge-recursive.h"
@ -114,7 +115,7 @@ static void branch_info_release(struct branch_info *info)
static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit, static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
int changed) int changed)
{ {
return run_hook_le(NULL, "post-checkout", return run_hooks_l("post-checkout",
oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()), oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()),
oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()), oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()),
changed ? "1" : "0", NULL); changed ? "1" : "0", NULL);

3
builtin/clone.c
View File

@ -32,6 +32,7 @@
#include "connected.h" #include "connected.h"
#include "packfile.h" #include "packfile.h"
#include "list-objects-filter-options.h" #include "list-objects-filter-options.h"
#include "hook.h"
/* /*
* Overall FIXMEs: * Overall FIXMEs:
@ -705,7 +706,7 @@ static int checkout(int submodule_progress)
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file")); die(_("unable to write new index file"));
err |= run_hook_le(NULL, "post-checkout", oid_to_hex(null_oid()), err |= run_hooks_l("post-checkout", oid_to_hex(null_oid()),
oid_to_hex(&oid), "1", NULL); oid_to_hex(&oid), "1", NULL);
if (!err && (option_recurse_submodules.nr > 0)) { if (!err && (option_recurse_submodules.nr > 0)) {

3
reset.c
View File

@ -7,6 +7,7 @@
#include "tree-walk.h" #include "tree-walk.h"
#include "tree.h" #include "tree.h"
#include "unpack-trees.h" #include "unpack-trees.h"
#include "hook.h"
int reset_head(struct repository *r, struct object_id *oid, const char *action, int reset_head(struct repository *r, struct object_id *oid, const char *action,
const char *switch_to_branch, unsigned flags, const char *switch_to_branch, unsigned flags,
@ -127,7 +128,7 @@ reset_head_refs:
reflog_head); reflog_head);
} }
if (run_hook) if (run_hook)
run_hook_le(NULL, "post-checkout", run_hooks_l("post-checkout",
oid_to_hex(orig ? orig : null_oid()), oid_to_hex(orig ? orig : null_oid()),
oid_to_hex(oid), "1", NULL); oid_to_hex(oid), "1", NULL);