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

trace2:data: add trace2 hook classification

Browse Source 
Classify certain child processes as hooks.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler
2019-02-22 14:25:06 -08:00
committed by Junio C Hamano
parent abd81a3d79
commit 6206286e49
5 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/am.c
View File

@ -453,6 +453,7 @@ static int run_post_rewrite_hook(const struct am_state *state)
cp.in = xopen(am_path(state, "rewritten"), O_RDONLY); cp.in = xopen(am_path(state, "rewritten"), O_RDONLY);
cp.stdout_to_stderr = 1; cp.stdout_to_stderr = 1;
cp.trace2_hook_name = "post-rewrite";
ret = run_command(&cp); ret = run_command(&cp);

4
builtin/receive-pack.c
View File

@ -694,6 +694,8 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
proc.argv = argv; proc.argv = argv;
proc.in = -1; proc.in = -1;
proc.stdout_to_stderr = 1; proc.stdout_to_stderr = 1;
proc.trace2_hook_name = hook_name;
if (feed_state->push_options) { if (feed_state->push_options) {
int i; int i;
for (i = 0; i < feed_state->push_options->nr; i++) for (i = 0; i < feed_state->push_options->nr; i++)
@ -807,6 +809,7 @@ static int run_update_hook(struct command *cmd)
proc.stdout_to_stderr = 1; proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0; proc.err = use_sideband ? -1 : 0;
proc.argv = argv; proc.argv = argv;
proc.trace2_hook_name = "update";
code = start_command(&proc); code = start_command(&proc);
if (code) if (code)
@ -1190,6 +1193,7 @@ static void run_update_post_hook(struct command *commands)
proc.no_stdin = 1; proc.no_stdin = 1;
proc.stdout_to_stderr = 1; proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0; proc.err = use_sideband ? -1 : 0;
proc.trace2_hook_name = "post-update";
if (!start_command(&proc)) { if (!start_command(&proc)) {
if (use_sideband) if (use_sideband)

1
builtin/worktree.c
View File

@ -402,6 +402,7 @@ done:
cp.dir = path; cp.dir = path;
cp.env = env; cp.env = env;
cp.argv = NULL; cp.argv = NULL;
cp.trace2_hook_name = "post-checkout";
argv_array_pushl(&cp.args, absolute_path(hook), argv_array_pushl(&cp.args, absolute_path(hook),
oid_to_hex(&null_oid), oid_to_hex(&null_oid),
oid_to_hex(&commit->object.oid), oid_to_hex(&commit->object.oid),

2
sequencer.c
View File

@ -1103,6 +1103,7 @@ static int run_rewrite_hook(const struct object_id *oldoid,
proc.argv = argv; proc.argv = argv;
proc.in = -1; proc.in = -1;
proc.stdout_to_stderr = 1; proc.stdout_to_stderr = 1;
proc.trace2_hook_name = "post-rewrite";
code = start_command(&proc); code = start_command(&proc);
if (code) if (code)
@ -3786,6 +3787,7 @@ cleanup_head_ref:
hook.in = open(rebase_path_rewritten_list(), hook.in = open(rebase_path_rewritten_list(),
O_RDONLY); O_RDONLY);
hook.stdout_to_stderr = 1; hook.stdout_to_stderr = 1;
hook.trace2_hook_name = "post-rewrite";
argv_array_push(&hook.args, post_rewrite_hook); argv_array_push(&hook.args, post_rewrite_hook);
argv_array_push(&hook.args, "rebase"); argv_array_push(&hook.args, "rebase");
/* we don't care if this hook failed */ /* we don't care if this hook failed */

1
transport.c
View File

@ -1062,6 +1062,7 @@ static int run_pre_push_hook(struct transport *transport,
proc.argv = argv; proc.argv = argv;
proc.in = -1; proc.in = -1;
proc.trace2_hook_name = "pre-push";
if (start_command(&proc)) { if (start_command(&proc)) {
finish_command(&proc); finish_command(&proc);