From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: John Cai via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Phillip Wood <phillip.wood123@gmail.com>,
John Cai <johncai86@gmail.com>
Subject: Re: [PATCH v3 2/2] rebase: set REF_HEAD_DETACH in checkout_up_to_date()
Date: Thu, 17 Mar 2022 08:34:47 -0700 [thread overview]
Message-ID: <xmqqy218h9t4.fsf@gitster.g> (raw)
In-Reply-To: <220317.86r170d6zs.gmgdl@evledraar.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Thu, 17 Mar 2022 14:42:53 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>> @@ -827,8 +827,11 @@ static int checkout_up_to_date(struct rebase_options *options)
>> getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
>> options->switch_to);
>> ropts.oid = &options->orig_head;
>> - ropts.branch = options->head_name;
>> ropts.flags = RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
>> + if (options->head_name)
>> + ropts.branch = options->head_name;
>> + else
>> + ropts.flags |= RESET_HEAD_DETACH;
>> ropts.head_msg = buf.buf;
>> if (reset_head(the_repository, &ropts) < 0)
>> ret = error(_("could not switch to %s"), options->switch_to);
>
> In this case a smaller change of:
>
> if (!ropts.branch)
> ropts.flags |= RESET_HEAD_DETACH;
>
> will do the same.
Thanks. That is much easier to read and simpler to follow.
> I wonder if just converting it to a designated initializer while we're
> at it (or a pre-cleanup commit) would be better, i.e.:
I do not think it easier to follow than even the original or the
improvement above, especially the part that computes .flags member.
next prev parent reply other threads:[~2022-03-17 15:35 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 5:05 [PATCH] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-11 5:33 ` Junio C Hamano
2022-03-11 5:55 ` Junio C Hamano
2022-03-11 14:14 ` John Cai
2022-03-11 15:05 ` Phillip Wood
2022-03-11 15:28 ` John Cai
2022-03-11 19:42 ` John Cai
2022-03-11 21:31 ` Phillip Wood
2022-03-11 17:24 ` [PATCH v2 0/2] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-11 17:24 ` [PATCH v2 1/2] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-13 7:50 ` Junio C Hamano
2022-03-14 10:52 ` Phillip Wood
2022-03-14 21:47 ` Junio C Hamano
2022-03-11 17:24 ` [PATCH v2 2/2] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-13 7:58 ` Junio C Hamano
2022-03-14 10:54 ` Phillip Wood
2022-03-14 14:05 ` Phillip Wood
2022-03-14 14:11 ` John Cai
2022-03-14 14:25 ` Phillip Wood
2022-03-17 3:16 ` [PATCH v3 0/2] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-17 3:16 ` [PATCH v3 1/2] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-17 13:37 ` Ævar Arnfjörð Bjarmason
2022-03-17 3:16 ` [PATCH v3 2/2] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-17 13:42 ` Ævar Arnfjörð Bjarmason
2022-03-17 15:34 ` Junio C Hamano [this message]
2022-03-17 19:53 ` [PATCH v4 0/3] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-17 19:53 ` [PATCH v4 1/3] rebase: test showing bug in rebase with non-branch John Cai via GitGitGadget
2022-03-17 21:10 ` Junio C Hamano
2022-03-17 21:37 ` Junio C Hamano
2022-03-17 22:44 ` John Cai
2022-03-17 19:53 ` [PATCH v4 2/3] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-18 11:14 ` Phillip Wood
2022-03-18 13:06 ` John Cai
2022-03-17 19:53 ` [PATCH v4 3/3] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-17 21:36 ` Junio C Hamano
2022-03-18 0:30 ` John Cai
2022-03-18 13:54 ` [PATCH v5 0/2] rebase: update HEAD when is an oid John Cai via GitGitGadget
2022-03-18 13:54 ` [PATCH v5 1/2] rebase: use test_commit helper in setup John Cai via GitGitGadget
2022-03-18 16:51 ` Junio C Hamano
2022-03-18 13:54 ` [PATCH v5 2/2] rebase: set REF_HEAD_DETACH in checkout_up_to_date() John Cai via GitGitGadget
2022-03-18 16:55 ` [PATCH v5 0/2] rebase: update HEAD when is an oid Junio C Hamano
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=xmqqy218h9t4.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johncai86@gmail.com \
--cc=phillip.wood123@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).