diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:35 -0700 |
| commit | b4a1eec33249344b5c7b978d397259088cafd219 (patch) | |
| tree | 128d1be124f4b323371a4efffb4767cf10a84b36 /common-main.c | |
| parent | Merge branch 'py/git-gui-do-quit' (diff) | |
| parent | config: stop checking whether the_repository is NULL (diff) | |
| download | tgif-b4a1eec33249344b5c7b978d397259088cafd219.tar.xz | |
Merge branch 'jk/repo-init-cleanup'
Further clean-up of the initialization code.
* jk/repo-init-cleanup:
config: stop checking whether the_repository is NULL
common-main: delay trace2 initialization
t1309: use short branch name in includeIf.onbranch test
Diffstat (limited to 'common-main.c')
| -rw-r--r-- | common-main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common-main.c b/common-main.c index 582a7b1886..71e21dd20a 100644 --- 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); |