From a7bc01eb25c8743a9ab22d7007555b3ccad5d99c Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Mon, 15 Apr 2019 13:39:45 -0700 Subject: trace2: find exec-dir before trace2 initialization Teach Git to resolve the executable directory before initializing Trace2. This allows the system configuration directory to be discovered earlier (because it is sometimes relative to the prefix or runtime-prefix). This will be used by the next commit to allow trace2 settings to be loaded from the system config. Signed-off-by: Jeff Hostetler Signed-off-by: Junio C Hamano --- common-main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common-main.c') diff --git a/common-main.c b/common-main.c index 6137af0e63..299ca62a72 100644 --- a/common-main.c +++ b/common-main.c @@ -37,12 +37,12 @@ int main(int argc, const char **argv) sanitize_stdfds(); restore_sigpipe_to_default(); + git_resolve_executable_dir(argv[0]); + trace2_initialize(); trace2_cmd_start(argv); trace2_collect_process_info(); - git_resolve_executable_dir(argv[0]); - git_setup_gettext(); initialize_the_repository(); -- cgit v1.2.3