diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 03:59:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 03:59:56 +0300 |
| commit | 32038fef00b02fb52f362d1d0cf1c25c6c382abb (patch) | |
| tree | 45b41a51c59dc7fbaae9a0414ef6b0e9b4579b31 /builtin/am.c | |
| parent | 47e1019efd3a2977d1d92a3644817b0712d5d259 (diff) | |
| parent | a446f2dcc8db1e64bb9152de1126ee06bc723304 (diff) | |
Merge branch 'jh/trace2'
A more structured way to obtain execution trace has been added.
* jh/trace2:
trace2: add for_each macros to clang-format
trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
trace2:data: add subverb for rebase
trace2:data: add subverb to reset command
trace2:data: add subverb to checkout command
trace2:data: pack-objects: add trace2 regions
trace2:data: add trace2 instrumentation to index read/write
trace2:data: add trace2 hook classification
trace2:data: add trace2 transport child classification
trace2:data: add trace2 sub-process classification
trace2:data: add editor/pager child classification
trace2:data: add trace2 regions to wt-status
trace2: collect Windows-specific process information
trace2: create new combined trace facility
trace2: Documentation/technical/api-trace2.txt
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index cd051fecdf..86e33495b0 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -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.stdout_to_stderr = 1; + cp.trace2_hook_name = "post-rewrite"; ret = run_command(&cp); |