admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ds/cmd-main-reorder'

Browse Source 
Code clean-up.

* ds/cmd-main-reorder:
  git.c: improve code readability in cmd_main()
This commit is contained in:
Junio C Hamano
2022-10-21 11:37:28 -07:00
parent 91d3d7e6e2 413bc6d20a
commit 1f20aa22d7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
git.c
View File

@@ -894,12 +894,8 @@ int cmd_main(int argc, const char **argv)
argv++; argv++;
argc--; argc--;
handle_options(&argv, &argc, NULL); handle_options(&argv, &argc, NULL);
if (argc > 0) {
if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0])) if (!argc) {
argv[0] = "version";
else if (!strcmp("--help", argv[0]) || !strcmp("-h", argv[0]))
argv[0] = "help";
} else {
/* The user didn't specify a command; give them help */ /* The user didn't specify a command; give them help */
commit_pager_choice(); commit_pager_choice();
printf(_("usage: %s\n\n"), git_usage_string); 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)); printf("\n%s\n", _(git_more_info_string));
exit(1); 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]; cmd = argv[0];
/* /*