diff options
| author | Daniel Sonbolian <dsal3389@gmail.com> | 2022-10-08 16:21:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-08 22:11:37 -0700 |
| commit | 413bc6d20ad4d686f68afcf3c012b77840c1243b (patch) | |
| tree | a7b5a1403b7b120a958e77978d7f398f71b305f4 | |
| parent | a0feb8611d4c0b2b5d954efe4e98207f62223436 (diff) | |
| download | git-413bc6d20ad4d686f68afcf3c012b77840c1243b.tar.gz | |
git.c: improve code readability in cmd_main()
Check for an error condition whose body unconditionally exists
first, and then perform the special casing of "version" and "help"
as part of the preparation for the "normal codepath". This makes
the code simpler to read.
Signed-off-by: Daniel Sonbolian <dsal3389@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -893,12 +893,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); @@ -906,6 +902,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]; /* |