Re: [PATCH 02/11] reset_head(): fix checkout
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Oct 1, 2021, 22:47 UTC
- Message-ID
- <CAPig+cTVODZX1tS1FJe16OH0pTgW4dagau3eAHrwDmnBpYNZ7Q@mail.gmail.com>
- In-Reply-To
- <c8f641132160d6bbd72a5e4921f1c9f0b3d40242.1633082702.git.gitgitgadget@gmail.com>
On Fri, Oct 1, 2021 at 6:06 AM Phillip Wood via GitGitGadget <gitgitgadget@gmail.com> wrote:
> The reset bit should only be set if flags contains RESET_HEAD_HARD. > The test for `!deatch_head` dates back to the original implementation
s/deatch_head/detach_head/
Show 7 quoted lines
> of reset_head() in ac7f467fef ("builtin/rebase: support running "git
> rebase <upstream>"", 2018-08-07) and was correct until e65123a71d
> ("builtin rebase: support `git rebase <upstream> <switch-to>`",
> 2018-09-04) started using reset_head() to checkout <switch-to> when
> fast-forwarding.
>
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>