git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Philip Oakley <philipoakley@iee.org>
Date
Mar 7, 2019, 12:34 UTC
Message-ID
<f6052ac6-60c4-1e70-b3f4-571885ba9e8d@iee.org>
In-Reply-To
<CACsJy8C7F_Ju2F7COUVd9-1FcyQL=mZph7qmkDh9sS-ENb4PEQ@mail.gmail.com>
On 06/03/2019 09:44, Duy Nguyen wrote:
Show 31 quoted lines
> On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano <gitster@pobox.com> 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@hank.intra.tgummerer.com>
> 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.
Just catching up on back emails:

The one point I noted is that "Overlay" is a new magic term without any explanation within the _documentation_.

It would appear worth it to also add something (follow up patch?) to the e.g. git glossary to clarify how overlay differs, or is similar to, the different merge and reset modes.

--
Philip
Previous: Junio C HamanoNext: Duy Nguyen
Message 8 of 31 in “What's cooking in git.git (Mar 2019, #01; Wed, 6)”
  1. Junio C HamanoMar 6, 2019
  2. Denton LiuMar 6, 2019
  3. Junio C HamanoMar 6, 2019
  4. Jeff KingMar 6, 2019
  5. Junio C HamanoMar 6, 2019
  6. Duy NguyenMar 6, 2019
  7. Junio C HamanoMar 6, 2019
  8. Philip OakleyMar 7, 2019
  9. Duy NguyenMar 7, 2019
  10. Thomas GummererMar 9, 2019
  11. Elijah NewrenMar 9, 2019
  12. Thomas GummererMar 10, 2019
  13. glossary: add definition for overlayThomas Gummerer, Mar 12, 2019
  14. Duy NguyenMar 13, 2019
  15. Thomas GummererMar 15, 2019
  16. Junio C HamanoMar 13, 2019
  17. Thomas GummererMar 15, 2019
  18. glossary: add definition for overlayThomas Gummerer, Mar 17, 2019
  19. Philip OakleyMar 21, 2019
  20. Junio C HamanoMar 22, 2019
  21. Thomas GummererMar 28, 2019
  22. Junio C HamanoMar 8, 2019
  23. Johannes SchindelinMar 6, 2019
  24. Junio C HamanoMar 18, 2019
  25. Johannes SchindelinMar 6, 2019
  26. Junio C HamanoMar 6, 2019
  27. Johannes SchindelinMar 6, 2019
  28. ps/stash-in-c, was Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)Johannes Schindelin, Mar 6, 2019
  29. Junio C HamanoMar 6, 2019
  30. Jonathan TanMar 6, 2019
  31. Junio C HamanoMar 7, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.