Re: [PATCH 2/5] parse_branchname_arg(): introduce expect_commit_only
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 18, 2019, 19:18 UTC
- Message-ID
- <xmqqfthhe92v.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <a84633a44474aa25bd1101a9ca2a5d9687900bf2.1574969538.git.gitgitgadget@gmail.com>
"Alexandr Miloslavskiy via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> > > `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?
Show 20 quoted lines
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 655b389756..5c6131dbe6 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -1123,7 +1123,7 @@ static int parse_branchname_arg(int argc, const char **argv,
> const char **new_branch = &opts->new_branch;
> const char *arg;
> int dash_dash_pos;
> - int has_dash_dash = 0;
> + int has_dash_dash = 0, expect_commit_only = 0;
> int i;
>
> /*
> @@ -1194,7 +1194,10 @@ static int parse_branchname_arg(int argc, const char **argv,
> die(_("only one reference expected, %d given."), dash_dash_pos);
> }
>
> - opts->count_checkout_paths = !opts->quiet && !has_dash_dash;
> + if (has_dash_dash)
> + expect_commit_only = 1;Non-standard indentation here.
> + 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.
Thanks.
Show 31 quoted lines
> @@ -1210,10 +1213,10 @@ static int parse_branchname_arg(int argc, const char **argv,
> */
> int recover_with_dwim = dwim_new_local_branch_ok;
>
> - int could_be_checkout_paths = !has_dash_dash &&
> + int could_be_checkout_paths = !expect_commit_only &&
> check_filename(opts->prefix, arg);
>
> - if (!has_dash_dash && !no_wildcard(arg))
> + if (!expect_commit_only && !no_wildcard(arg))
> recover_with_dwim = 0;
>
> /*
> @@ -1242,7 +1245,7 @@ static int parse_branchname_arg(int argc, const char **argv,
> }
>
> if (!recover_with_dwim) {
> - if (has_dash_dash)
> + if (expect_commit_only)
> die(_("invalid reference: %s"), arg);
> return 0;
> }
> @@ -1253,7 +1256,7 @@ static int parse_branchname_arg(int argc, const char **argv,
> if (!opts->source_tree) /* case (1): want a tree */
> die(_("reference is not a tree: %s"), arg);
>
> - if (!has_dash_dash) { /* case (3).(d) -> (1) */
> + if (!expect_commit_only) { /* case (3).(d) -> (1) */
> /*
> * Do not complain the most common case
> * git checkout branch