diff --git a/builtin/checkout.c b/builtin/checkout.c index 6cd95242109eb5..053d62b2538423 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -924,12 +924,12 @@ static void update_refs_for_switch(const struct checkout_opts *opts, (new_branch_info->path || (!opts->force_detach && !strcmp(new_branch_info->name, "HEAD")))) { unsigned long nr_unpack_entry_at_start; - trace2_region_enter("exp", "report_tracking", the_repository); + trace2_region_enter("tracking", "report_tracking", the_repository); nr_unpack_entry_at_start = get_nr_unpack_entry(); report_tracking(new_branch_info); - trace2_data_intmax("exp", NULL, "report_tracking/nr_unpack_entries", + trace2_data_intmax("tracking", NULL, "report_tracking/nr_unpack_entries", (intmax_t)(get_nr_unpack_entry() - nr_unpack_entry_at_start)); - trace2_region_leave("exp", "report_tracking", the_repository); + trace2_region_leave("tracking", "report_tracking", the_repository); } } diff --git a/remote.c b/remote.c index e50f7602eda56e..b6e503bee02c1b 100644 --- a/remote.c +++ b/remote.c @@ -2003,7 +2003,16 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb, char *base; int upstream_is_gone = 0; + trace2_region_enter("tracking", "stat_tracking_info", NULL); sti = stat_tracking_info(branch, &ours, &theirs, &full_base, 0, abf); + trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_flags", abf); + trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_result", sti); + if (abf == AHEAD_BEHIND_FULL) { + trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_ahead", ours); + trace2_data_intmax("tracking", NULL, "stat_tracking_info/ab_behind", theirs); + } + trace2_region_leave("tracking", "stat_tracking_info", NULL); + if (sti < 0) { if (!full_base) return 0; diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c index c2852d1bd2bd85..19e41544c9c5c4 100644 --- a/trace2/tr2_tgt_event.c +++ b/trace2/tr2_tgt_event.c @@ -32,7 +32,7 @@ static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0 }; * event target. Use the TR2_SYSENV_EVENT_NESTING setting to increase * region details in the event target. */ -static int tr2env_event_max_nesting_levels = 2; +static int tr2env_event_max_nesting_levels = 4; /* * Use the TR2_SYSENV_EVENT_BRIEF to omit the