]> granicus.if.org Git - git/commitdiff
trace2: find exec-dir before trace2 initialization
authorJeff Hostetler <jeffhost@microsoft.com>
Mon, 15 Apr 2019 20:39:45 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Apr 2019 04:37:06 +0000 (13:37 +0900)
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 <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
common-main.c

index 6137af0e63cdc0addbeb2e9a4e231f0a6a279944..299ca62a72c39784f7035b6aca19e64ff1d7d314 100644 (file)
@@ -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();