From: Junio C Hamano <gitster@pobox.com>
To: "Alexandr Miloslavskiy via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Subject: Re: [PATCH 1/5] parse_branchname_arg(): fix dash_dash_pos, drop argcount
Date: Wed, 18 Dec 2019 10:52:45 -0800 [thread overview]
Message-ID: <xmqqk16tea9u.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <771947d01f759a72b9f8999e929bf1f7765327aa.1574969538.git.gitgitgadget@gmail.com> (Alexandr Miloslavskiy via GitGitGadget's message of "Thu, 28 Nov 2019 19:32:14 +0000")
"Alexandr Miloslavskiy via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
>
> `dash_dash_pos` was only calculated under `opts->accept_pathspec`. This
> is unexpected to readers and made it harder to reason about the code.
> Fix this by restoring the expected meaning.
Perhaps. I think the original reasoning was to compute only where
dash_dash_pos will be needed, but the code changes over time, and
places that need the value of dash_dash_pos would change over time,
so from that point of view, I think it makes sense to make sure it
gets always computed like this patch does.
> Simplify the code by dropping `argcount` and useless `argc` / `argv`
> manipulations.
I am not sure if this is a good change, though. It goes against the
reasoning that makes the above "dash-dash-pos" change is a good one,
doesn't it? When the code changes over time, wouldn't it make the
code more clear to keep track of the count of args it saw in a
separate variable, than relying on the invariant that currently
happens to hold which is "if dash-dash is after the first argument,
return 2 and otherwise return 1"?
> @@ -1121,7 +1121,6 @@ static int parse_branchname_arg(int argc, const char **argv,
> int *dwim_remotes_matched)
> {
> const char **new_branch = &opts->new_branch;
> - int argcount = 0;
> const char *arg;
> int dash_dash_pos;
> int has_dash_dash = 0;
> @@ -1180,17 +1179,21 @@ static int parse_branchname_arg(int argc, const char **argv,
> arg = argv[0];
> dash_dash_pos = -1;
> for (i = 0; i < argc; i++) {
> - if (opts->accept_pathspec && !strcmp(argv[i], "--")) {
> + if (!strcmp(argv[i], "--")) {
> dash_dash_pos = i;
> break;
> }
> }
> - if (dash_dash_pos == 0)
> - return 1; /* case (2) */
> - else if (dash_dash_pos == 1)
> - has_dash_dash = 1; /* case (3) or (1) */
> - else if (dash_dash_pos >= 2)
> - die(_("only one reference expected, %d given."), dash_dash_pos);
> +
> + if (opts->accept_pathspec) {
> + if (dash_dash_pos == 0)
> + return 1; /* case (2) */
> + else if (dash_dash_pos == 1)
> + has_dash_dash = 1; /* case (3) or (1) */
> + else if (dash_dash_pos >= 2)
> + die(_("only one reference expected, %d given."), dash_dash_pos);
Non-standard indentation? In our code, a level of indent is another
horizontal tab.
> + }
next prev parent reply other threads:[~2019-12-18 18:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-28 19:32 [PATCH 0/5] parse_branchname_arg(): make code easier to understand Alexandr Miloslavskiy via GitGitGadget
2019-11-28 19:32 ` [PATCH 1/5] parse_branchname_arg(): fix dash_dash_pos, drop argcount Alexandr Miloslavskiy via GitGitGadget
2019-12-18 18:52 ` Junio C Hamano [this message]
2019-12-19 18:03 ` Alexandr Miloslavskiy
2019-11-28 19:32 ` [PATCH 2/5] parse_branchname_arg(): introduce expect_commit_only Alexandr Miloslavskiy via GitGitGadget
2019-12-18 19:18 ` Junio C Hamano
2019-12-19 18:03 ` Alexandr Miloslavskiy
2019-11-28 19:32 ` [PATCH 3/5] parse_branchname_arg(): update code comments Alexandr Miloslavskiy via GitGitGadget
2019-11-28 19:32 ` [PATCH 4/5] parse_branchname_arg(): refactor the decision making Alexandr Miloslavskiy via GitGitGadget
2019-11-28 19:32 ` [PATCH 5/5] t2024: cover more cases Alexandr Miloslavskiy 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=xmqqk16tea9u.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=alexandr.miloslavskiy@syntevo.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).