Merge branch 'en/checkout-mismerge-fix'

diff --git a/common-main.c b/common-main.c
index 582a7b18869fb80c94b3a0057e4cb9ced4c6f1c2..71e21dd20a3b141bed0d37512cdc9196321dc315 100644 (file)
--- a/common-main.c
+++ b/common-main.c
@@ -39,16 +39,16 @@ int main(int argc, const char **argv)
 
        git_resolve_executable_dir(argv[0]);
 
-       trace2_initialize();
-       trace2_cmd_start(argv);
-       trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
-
        git_setup_gettext();
 
        initialize_the_repository();
 
        attr_start();
 
+       trace2_initialize();
+       trace2_cmd_start(argv);
+       trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP);
+
        result = cmd_main(argc, argv);
 
        trace2_cmd_exit(result);