From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
To: Junio C Hamano <gitster@pobox.com>,
Alexandr Miloslavskiy via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/5] parse_branchname_arg(): introduce expect_commit_only
Date: Thu, 19 Dec 2019 19:03:23 +0100 [thread overview]
Message-ID: <713f8aea-cdd6-3fcd-8e9f-c9b909454ef5@syntevo.com> (raw)
In-Reply-To: <xmqqfthhe92v.fsf@gitster-ct.c.googlers.com>
On 18.12.2019 20:18, Junio C Hamano wrote:
>> `has_dash_dash` unexpectedly takes `opts->accept_pathspec` into account.
>
> You also touched the code that depends on opts->accept_pathspec in
> the earlier step 1/5; these two steps seem harder to reason about
> than necessary---I wonder if it is easier to explain and understand
> if these two steps are merged into one and explained together?
Yes, that sounds like a good idea! In V3 in other topic [1] I have
shuffled the changes between commits for easier understanding.
>> + if (has_dash_dash)
>> + expect_commit_only = 1;
>
> Non-standard indentation here.
Sorry!
>> + opts->count_checkout_paths = !opts->quiet && !expect_commit_only;
>
> OK. count_checkout_paths is relevant only when checking out paths
> out of a tree-ish, so "expect-commit-only" would be false in such a
> situation. On the other hand, if we were checking out a branch (or
> detaching), we must have a commit and a tree-ish is insufficient,
> so expect_commit_only would be true in such a case.
>
> Makes sense. I am wondering if we still need has_dash_dash, and
> also if expect_commit_only is the best name for the variable.
It seems that indeed, the variable could use an even better name. It's
<commit> as opposed to <pathspec>, and not as opposed to <tree-ish>. I
have renamed the variable again in V3 in other topic [1].
----
[1]
https://lore.kernel.org/git/pull.490.v3.git.1576778515.gitgitgadget@gmail.com/
next prev parent reply other threads:[~2019-12-19 18:03 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
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 [this message]
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=713f8aea-cdd6-3fcd-8e9f-c9b909454ef5@syntevo.com \
--to=alexandr.miloslavskiy@syntevo.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).