From: Victoria Dye <vdye@github.com>
To: dsal3389 via GitGitGadget <gitgitgadget@gmail.com>, git@vger.kernel.org
Cc: dsal3389 <dsal3389@gmail.com>
Subject: Re: [PATCH 2/2] removed else statement
Date: Thu, 6 Oct 2022 09:14:10 -0700 [thread overview]
Message-ID: <44d2f602-a299-3bd0-1624-cfdddb6dcda7@github.com> (raw)
In-Reply-To: <c107ad9f6ff2d5e00134eb1348f24737774edbac.1665056747.git.gitgitgadget@gmail.com>
dsal3389 via GitGitGadget wrote:
> From: dsal3389 <dsal3389@gmail.com>
>
> 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@github.com/
>
> Signed-off-by: Daniel Sonbolian <dsal3389@gmail.com>
> ---
> 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];
>
> /*
next prev parent reply other threads:[~2022-10-06 16:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-06 11:45 [PATCH 0/2] Minor Refactors: remove useless else dsal3389 via GitGitGadget
2022-10-06 11:45 ` [PATCH 1/2] python file more pytonic, adjust "if" and "for" dsal3389 via GitGitGadget
2022-10-06 16:02 ` Victoria Dye
2022-10-06 17:16 ` Junio C Hamano
2022-10-06 11:45 ` [PATCH 2/2] removed else statement dsal3389 via GitGitGadget
2022-10-06 16:14 ` Victoria Dye [this message]
2022-10-07 18:35 ` Junio C Hamano
2022-10-06 17:16 ` Junio C Hamano
2022-10-06 17:06 ` [PATCH 0/2] Minor Refactors: remove useless else Junio C Hamano
2022-10-07 14:38 ` [PATCH v2 0/2] git.c: improve readability | git-p4: minor optimization Daniel Sonbolian via GitGitGadget
2022-10-07 14:38 ` [PATCH v2 1/2] git-p4: minor optimization in read_pip_lines Daniel Sonbolian via GitGitGadget
2022-10-07 15:17 ` Phillip Wood
2022-10-07 17:28 ` Junio C Hamano
2022-10-07 14:38 ` [PATCH v2 2/2] git.c: improve code readability in cmd_main Daniel Sonbolian via GitGitGadget
2022-10-08 16:21 ` [PATCH v3] " Daniel Sonbolian via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44d2f602-a299-3bd0-1624-cfdddb6dcda7@github.com \
--to=vdye@github.com \
--cc=dsal3389@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).