Merge branch 'jk/delta-islands-progress-fix' into maint

diff --git a/common-main.c b/common-main.c
index d484aec20979ac9a1ea6d49b166f51436a24dfad..582a7b18869fb80c94b3a0057e4cb9ced4c6f1c2 100644 (file)
--- a/common-main.c
+++ b/common-main.c
@@ -27,6 +27,8 @@ int main(int argc, const char **argv)
 {
        int result;
 
+       trace2_initialize_clock();
+
        /*
         * Always open file descriptors 0/1/2 to avoid clobbering files
         * in die().  It also avoids messing up when the pipes are dup'ed
@@ -35,11 +37,11 @@ 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]);
+       trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
 
        git_setup_gettext();