Web lists-archives.com

Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)

On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
> * tg/checkout-no-overlay (2019-02-04) 9 commits
>   (merged to 'next' on 2019-02-04 at 9968bcf4fb)
>  + revert "checkout: introduce checkout.overlayMode config"
>   (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
>  + checkout: introduce checkout.overlayMode config
>  + checkout: introduce --{,no-}overlay option
>  + checkout: factor out mark_cache_entry_for_checkout function
>  + checkout: clarify comment
>  + read-cache: add invalidate parameter to remove_marked_cache_entries
>  + entry: support CE_WT_REMOVE flag in checkout_entry
>  + entry: factor out unlink_entry function
>  + move worktree tests to t24*
>  "git checkout --no-overlay" can be used to trigger a new mode of
>  checking out paths out of the tree-ish, that allows paths that
>  match the pathspec that are in the current index and working tree
>  and are not in the tree-ish.
>  Will hold.
>  Waiting for "restore-files" & "switch-branches" pair.
>  cf. <20190205204208.GC6085@xxxxxxxxxxxxxxxxxxxxxxxx>

If it's ready for master, I'd love to see it merged. Either that or
topic is rebased on 'master'. There are separate checkout changes in
'master' (mine, sadly), and because switch/restore moves lots of code
around, I need to create a merge of this topic and master as the base,
or you'll get horrible conflicts.

I should send switch/restore again soon. There are still a few
unaddressed concerns for git-restore since last time. Probably time to
refresh those discussions.