From: John Cai <johncai86@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "John Cai via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Phillip Wood" <phillip.wood123@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH v4 3/3] rebase: set REF_HEAD_DETACH in checkout_up_to_date()
Date: Thu, 17 Mar 2022 20:30:16 -0400 [thread overview]
Message-ID: <C271A4C3-2299-4D9D-BAA8-28968BFBE6C6@gmail.com> (raw)
In-Reply-To: <xmqq8rt8dzxr.fsf@gitster.g>
Hi Junio,
On 17 Mar 2022, at 17:36, Junio C Hamano wrote:
> "John Cai via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> From: John Cai <johncai86@gmail.com>
>>
>> Fixes a bug whereby rebase updates the deferenced reference HEAD points
>> to instead of HEAD directly.
>
> Perhaps
>
> "git rebase A B", where B is not a commit, should behave as if
> the HEAD got detached at B and then the detached HEAD got
> rebased on top of A. A bug however overwrites the current
> branch to point at B, when B is a descendant of A (i.e. the
> rebase ends up being a fast-forward).
>
>> ... See [1] for
>> the original bug report.
>
> OK (URL is wrong; see below).
>
> The explanation of how the bug occurs (elided) in the patch looked
> all reasonable. It read well.
>
>> ...
>> Also add a test to ensure the correct behavior.
>
> Yup. _Add_ a test to ensure that. Not replace a misleading test
> that expected to see a wrong behaviour.
>
>> 1. https://lore.kernel.org/git/xmqqsfrpbepd.fsf@gitster.g/
>
> This is not the original bug report. It was an early hint for
> diagnosis.
>
> [1] https://lore.kernel.org/git/YiokTm3GxIZQQUow@newk/
>
> would be a more appropriate pointer.
>
>> ropts.oid = &options->orig_head;
>> ropts.branch = options->head_name;
>> ropts.flags = RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
>> + if (!ropts.branch)
>> + ropts.flags |= RESET_HEAD_DETACH;
>> ropts.head_msg = buf.buf;
>
> OK. If head_name is not set, we do not want to touch the branch
> the HEAD happens to be pointing at, so we want to detach.
>
>> +test_expect_success 'switch to non-branch detaches HEAD' '
>> git checkout main &&
>> old_main=$(git rev-parse HEAD) &&
>> git rebase First Second^0 &&
>> - test_cmp_rev HEAD main &&
>> - test_cmp_rev main $(git rev-parse Second) &&
>> - git symbolic-ref HEAD
>> + test_cmp_rev HEAD Second &&
>> + test_cmp_rev main $old_main &&
>> + test_must_fail git symbolic-ref HEAD
>
> As we want (1) HEAD (detached) is pointing at Second, (2) 'main'
> stayed at $old_main, and (3) HEAD is detched, these three conditions
> look sane.
>
> Thanks.
>
> For reference, I discarded [1/3], queued [2/3] and replaced this
> [3/3] with the following for now.
Sounds good--this is what I was about to do anyways!
>
> ---- >8 ---- ---- >8 ---- ---- >8 ---- ---- >8 ---- ---- >8 ----
> From: John Cai <johncai86@gmail.com>
> Subject: [PATCH] rebase: set REF_HEAD_DETACH in checkout_up_to_date()
>
> "git rebase A B" where B is not a commit should behave as if the
> HEAD got detached at B and then the detached HEAD got rebased on top
> of A. A bug however overwrites the current branch to point at B,
> when B is a descendant of A (i.e. the rebase ends up being a
> fast-forward). See [1] for the original bug report.
>
> The callstack from checkout_up_to_date() is the following:
>
> cmd_rebase()
> -> checkout_up_to_date()
> -> reset_head()
> -> update_refs()
> -> update_ref()
>
> When B is not a valid branch but an oid, rebase sets the head_name
> of rebase_options to NULL. This value gets passed down this call
> chain through the branch member of reset_head_opts also getting set
> to NULL all the way to update_refs().
>
> Then update_refs() checks ropts.branch to decide whether or not to switch
> branches. If ropts.branch is NULL, it calls update_ref() to update HEAD.
> At this point however, from rebase's point of view, we want a detached
> HEAD. But, since checkout_up_to_date() does not set the RESET_HEAD_DETACH
> flag, the update_ref() call will deference HEAD and update the branch its
> pointing to. We want the HEAD detached at B instead.
>
> Fix this bug by adding the RESET_HEAD_DETACH flag in
> checkout_up_to_date if B is not a valid branch, so that once
> reset_head() calls update_refs(), it calls update_ref() with
> REF_NO_DEREF which updates HEAD directly intead of deferencing it
> and updating the branch that HEAD points to.
>
> Also add a test to ensure the correct behavior.
>
> [1] https://lore.kernel.org/git/YiokTm3GxIZQQUow@newk/
>
> Reported-by: Michael McClimon <michael@mcclimon.org>
> Signed-off-by: John Cai <johncai86@gmail.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> builtin/rebase.c | 2 ++
> t/t3400-rebase.sh | 9 +++++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index b29ad2b65e..27fde7bf28 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -829,6 +829,8 @@ static int checkout_up_to_date(struct rebase_options *options)
> ropts.oid = &options->orig_head;
> ropts.branch = options->head_name;
> ropts.flags = RESET_HEAD_RUN_POST_CHECKOUT_HOOK;
> + if (!ropts.branch)
> + 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);
> diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
> index 6dc8df8be7..cf55b017ff 100755
> --- a/t/t3400-rebase.sh
> +++ b/t/t3400-rebase.sh
> @@ -389,6 +389,15 @@ test_expect_success 'switch to branch not checked out' '
> git rebase main other
> '
>
> +test_expect_success 'switch to non-branch detaches HEAD' '
> + git checkout main &&
> + old_main=$(git rev-parse HEAD) &&
> + git rebase First Second^0 &&
> + test_cmp_rev HEAD Second &&
> + test_cmp_rev main $old_main &&
> + test_must_fail git symbolic-ref HEAD
> +'
> +
> test_expect_success 'refuse to switch to branch checked out elsewhere' '
> git checkout main &&
> git worktree add wt &&
> --
> 2.35.1-757-g4266a5c05c
Thanks
John
next prev parent reply other threads:[~2022-03-18 0:30 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
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 [this message]
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=C271A4C3-2299-4D9D-BAA8-28968BFBE6C6@gmail.com \
--to=johncai86@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).