dsal3389 via GitGitGadget wrote:
> From: dsal3389 <dsal3389@xxxxxxxxx>
>
> there is no need for the else statement if we can do it more
> elegantly with a signle if statement we no "else"
Similar recommendations on the commit message as in the previous patch [1]:
- title should be prefixed with 'git.c:'
- title & message should use the imperative mood (e.g. "remove else
statement" instead of "removed else statement")
- please fix typos
- s/there/There
- s/signle/single
- s/we/with(?)
[1] https://lore.kernel.org/git/66d1bcaf-64c8-13c2-ba7a-98715de3617b@xxxxxxxxxx/
>
> Signed-off-by: Daniel Sonbolian <dsal3389@xxxxxxxxx>
> ---
> git.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/git.c b/git.c
> index da411c53822..340ec8bcb31 100644
> --- a/git.c
> +++ b/git.c
> @@ -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 <= 0) {
nit: argc is always >= 0 [2], so a more appropriate condition would be:
if (!argc)
There are lots of examples of that '!argc' conditional in Git, but none of
the 'argc <= 0' pattern, so it's probably best to match convention here.
Otherwise, the rest of this diff looks good.
[2] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf, §5.1.2.2.1 #2
> /* 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];
>
> /*
