summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff Hostetler <jeffhost@microsoft.com>2019-04-15 13:39:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-16 13:37:06 +0900
commita7bc01eb25c8743a9ab22d7007555b3ccad5d99c (patch)
treecaa9207e0fa2bcf939acf4a228e93a4dc935630f
parenttrace2: add absolute elapsed time to start event (diff)
downloadtgif-a7bc01eb25c8743a9ab22d7007555b3ccad5d99c.tar.xz
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 <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--common-main.c4
1 files changed, 2 insertions, 2 deletions
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();