diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-10-21 21:37:28 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-21 21:37:29 +0300 |
commit | 1f20aa22d7bdb4fb1132f703620a8a2ddeee1162 (patch) | |
tree | 9640e49c731e02d60018ce73ccb34402851ddf3f /git.c | |
parent | 91d3d7e6e2be4aad74c5c602ed4988fbb1d82960 (diff) | |
parent | 413bc6d20ad4d686f68afcf3c012b77840c1243b (diff) |
Merge branch 'ds/cmd-main-reorder'
Code clean-up.
* ds/cmd-main-reorder:
git.c: improve code readability in cmd_main()
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -894,12 +894,8 @@ int cmd_main(int argc, const char **argv) argv++; argc--; handle_options(&argv, &argc, NULL); - if (argc > 0) { - if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0])) - argv[0] = "version"; - else if (!strcmp("--help", argv[0]) || !strcmp("-h", argv[0])) - argv[0] = "help"; - } else { + + if (!argc) { /* The user didn't specify a command; give them help */ commit_pager_choice(); printf(_("usage: %s\n\n"), git_usage_string); @@ -907,6 +903,12 @@ int cmd_main(int argc, const char **argv) printf("\n%s\n", _(git_more_info_string)); exit(1); } + + if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0])) + argv[0] = "version"; + else if (!strcmp("--help", argv[0]) || !strcmp("-h", argv[0])) + argv[0] = "help"; + cmd = argv[0]; /* |