Merge branch 'sd/negotiate-trace-fix' into maint-2.43

gitster · gitster · commit 81e3eea77c41 · 2024-02-13T14:44:50.000-08:00
Tracing fix.

* sd/negotiate-trace-fix:
  push: region_leave trace for negotiate_using_fetch
diff --git a/fetch-pack.c b/fetch-pack.c
@@ -2216,7 +2216,7 @@ void negotiate_using_fetch(const struct oid_array *negotiation_tips,
 					   the_repository, "%d",
 					   negotiation_round);
 	}
-	trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository);
+	trace2_region_leave("fetch-pack", "negotiate_using_fetch", the_repository);
 	trace2_data_intmax("negotiate_using_fetch", the_repository,
 			   "total_rounds", negotiation_round);
 	clear_common_flag(acked_commits);

Original file line number	Diff line number	Diff line change
`@@ -2216,7 +2216,7 @@ void negotiate_using_fetch(const struct oid_array *negotiation_tips,`
`2216`	`2216`	`the_repository, "%d",`
`2217`	`2217`	`negotiation_round);`
`2218`	`2218`	`}`
`2219`		`- trace2_region_enter("fetch-pack", "negotiate_using_fetch", the_repository);`
	`2219`	`+ trace2_region_leave("fetch-pack", "negotiate_using_fetch", the_repository);`
`2220`	`2220`	`trace2_data_intmax("negotiate_using_fetch", the_repository,`
`2221`	`2221`	`"total_rounds", negotiation_round);`
`2222`	`2222`	`clear_common_flag(acked_commits);`