From: Ben Peart <peartben@gmail.com>
To: Anthony Sottile <asottile@umich.edu>, Junio C Hamano <gitster@pobox.com>
Cc: Duy Nguyen <pclouds@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Regression `git checkout $rev -b branch` while in a `--no-checkout` clone does not check out files
Date: Wed, 16 Jan 2019 09:39:16 -0500 [thread overview]
Message-ID: <e9284bc1-0db2-6f90-6e8e-3a7682c03dd0@gmail.com> (raw)
In-Reply-To: <CA+dzEB=oeL2oByqiH4FeCHc29yGL2TwhmO1DKmRTDx8Xdhh=NQ@mail.gmail.com>
On 1/3/2019 5:05 PM, Anthony Sottile wrote:
> On Thu, Jan 3, 2019 at 1:51 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Anthony Sottile <asottile@umich.edu> writes:
>>
>>> On Thu, Jan 3, 2019 at 12:26 PM Junio C Hamano <gitster@pobox.com> wrote:
>>>> A "fix" to Ben's optimization for this particular case should be
>>>> fairly straight-forward. I think we have a special case in the
>>>> checkout codepath for an initial checkout and disable "carry forward
>>>> the fact that the user wanted all the paths removed", so it would be
>>>> the matter of adding yet another condition (is_cache_unborn(), which
>>>> is used to set topts.initial_checkout) to the large collection of
>>>> conditions in skip_merge_working_tree().
>>>
>>> I think it might be simpler than that even -- the optimization treats
>>> the following as equivalent when the current checked out revision is
>>> deadbeef (even if the index / worktree differ), when before they were
>>> not:
>>>
>>> - git checkout -b newbranch
>>> - git checkout deadbeef -b newbranch
>>>
>>> If a revision is specified on the commandline it should be checked out.
>>
>> If it were to be a "fix", the exact same command line as people used
>> to be able to use, i.e. "git checkout -b newbranch", should be made
>> to do what it used to do.
>>
>> Forcing users to use a different command to workaround the bug is
>> not a usable "fix". If we want a working workaround, you can tell
>> your users to use
>>
>> git reset --hard HEAD && git checkout -b newbranch
>>
>> and that would already work without any code change ;-).
>>
>>
Just noticed this thread. I agree that the behavior of `git clone
--no-checkout` is a little odd in that it shows everything as deleted
but the goal of the `checkout -b` optimization was to not change
behavior (unless the user opt-ed in to the changed behavior via
checkout.optimizeNewBranch). I'll work on a patch to detect this case
and ensure the default behavior doesn't change.
>
> oh wow, I didn't realize `git checkout -b newbranch` also used to
> reset the `--no-checkout` state, yeah you're right the optimization is
> way more problematic than I had considered.
>
> I'm working around by not using `--no-checkout` personally
>
> Anthony
>
next prev parent reply other threads:[~2019-01-16 14:39 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-01 23:17 Regression `git checkout $rev -b branch` while in a `--no-checkout` clone does not check out files Anthony Sottile
2019-01-02 11:08 ` Duy Nguyen
2019-01-02 16:18 ` Anthony Sottile
2019-01-03 10:04 ` Duy Nguyen
2019-01-03 20:25 ` Junio C Hamano
2019-01-03 20:35 ` Anthony Sottile
2019-01-03 21:51 ` Junio C Hamano
2019-01-03 22:05 ` Anthony Sottile
2019-01-16 14:39 ` Ben Peart [this message]
2019-01-18 18:55 ` [PATCH v1 0/2] Fix regression in checkout -b Ben Peart
2019-01-18 18:55 ` [PATCH v1 1/2] checkout: add test to demonstrate regression with checkout -b on initial commit Ben Peart
2019-01-18 19:23 ` SZEDER Gábor
2019-01-18 18:55 ` [PATCH v1 2/2] checkout: fix regression in checkout -b on intitial checkout Ben Peart
2019-01-18 20:00 ` Junio C Hamano
2019-01-19 0:52 ` SZEDER Gábor
2019-01-19 1:26 ` [PATCH v1 0/2] Fix regression in checkout -b Junio C Hamano
2019-01-21 19:50 ` [PATCH v2 " Ben Peart
2019-01-21 19:50 ` [PATCH v2 1/2] checkout: add test to demonstrate regression with checkout -b on initial commit Ben Peart
2019-01-23 17:57 ` SZEDER Gábor
2019-01-21 19:50 ` [PATCH v2 2/2] checkout: fix regression in checkout -b on intitial checkout Ben Peart
2019-01-22 14:35 ` Johannes Schindelin
2019-01-22 18:42 ` Junio C Hamano
2019-01-22 18:49 ` Jeff King
2019-01-22 18:54 ` [PATCH v2 0/2] Fix regression in checkout -b Junio C Hamano
2019-01-22 19:31 ` Ben Peart
2019-01-23 19:14 ` Junio C Hamano
2019-01-23 20:01 ` [PATCH v3 " Ben Peart
2019-01-23 20:02 ` [PATCH v3 1/2] checkout: add test demonstrating regression with checkout -b on initial commit Ben Peart
2019-01-23 20:02 ` [PATCH v3 2/2] checkout: fix regression in checkout -b on intitial checkout Ben Peart
2019-01-23 21:23 ` [PATCH v3 0/2] Fix regression in checkout -b 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9284bc1-0db2-6f90-6e8e-3a7682c03dd0@gmail.com \
--to=peartben@gmail.com \
--cc=asottile@umich.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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.
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 NNTP newsgroup(s).