From: Thomas Gummerer <t.gummerer@gmail.com> To: Duy Nguyen <pclouds@gmail.com> Cc: Philip Oakley <philipoakley@iee.org>, Junio C Hamano <gitster@pobox.com>, Git Mailing List <git@vger.kernel.org>, Jonathan Nieder <jrnieder@gmail.com> Subject: Re: What's cooking in git.git (Mar 2019, #01; Wed, 6) Date: Sat, 9 Mar 2019 17:27:33 +0000 Message-ID: <20190309172733.GC31533@hank.intra.tgummerer.com> (raw) In-Reply-To: <CACsJy8D48YiWYkuLW8BbeYvRz=yMmb=XWoMJroPXFAcSV2VjHw@mail.gmail.com> On 03/07, Duy Nguyen wrote: > On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley <philipoakley@iee.org> wrote: > > > > On 06/03/2019 09:44, Duy Nguyen wrote: > > > 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. > > I think Jonathan questions the name "overlay" too. Since this is > similar to "cp -R" mode, another suggestion is --copy-mode. That would leave the negative form as --no-copy-mode, which almost sounds like we wouldn't copy anything. I think that would be more confusing that [no ]overlay mode. I'd be fine in general with changing the name, if there is a consensus for a different and better name, but I also think overlay is reasonable, so I'd rather leave pushing for a different name to someone else that has strong opinions about it. Philip, do you think something like this would help? Not sure if it should be called overlay_mode in the glossary, rather than just overlay? --- >8 --- Subject: [PATCH] glossary: add definition for overlay Add a definition for what overlay means in the context of git, to clarify the recently introduced overlay-mode in git checkout. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> --- Documentation/glossary-content.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 023ca95e7c..70e6477a9f 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -287,6 +287,11 @@ This commit is referred to as a "merge commit", or sometimes just a origin/name-of-upstream-branch, which you can see using `git branch -r`. +[[def_overlay]]overlay:: + Only update and add files to the working directory, but don't + delete them, similar to how 'cp -R' works. This is the + default in a <<def_checkout,checkout>>. + [[def_pack]]pack:: A set of objects which have been compressed into one file (to save space or to transmit them efficiently). -- 2.20.1.495.gaa96b0ce6b
next prev parent reply other threads:[~2019-03-09 17:27 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-06 1:34 Junio C Hamano 2019-03-06 1:41 ` Denton Liu 2019-03-06 23:43 ` Junio C Hamano 2019-03-06 4:43 ` Jeff King 2019-03-06 23:45 ` Junio C Hamano 2019-03-06 9:44 ` Duy Nguyen 2019-03-06 23:46 ` Junio C Hamano 2019-03-07 12:34 ` Philip Oakley 2019-03-07 12:54 ` Duy Nguyen 2019-03-09 17:27 ` Thomas Gummerer [this message] 2019-03-09 18:04 ` Elijah Newren 2019-03-10 18:27 ` Thomas Gummerer 2019-03-12 23:30 ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer 2019-03-13 1:13 ` Duy Nguyen 2019-03-15 22:31 ` Thomas Gummerer 2019-03-13 1:42 ` Junio C Hamano 2019-03-15 23:10 ` Thomas Gummerer 2019-03-17 20:19 ` [PATCH v3] " Thomas Gummerer 2019-03-21 14:48 ` Philip Oakley 2019-03-22 4:54 ` Junio C Hamano 2019-03-28 21:05 ` Thomas Gummerer 2019-03-08 0:02 ` What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano 2019-03-06 12:39 ` Johannes Schindelin 2019-03-18 7:08 ` Junio C Hamano 2019-03-06 12:47 ` Johannes Schindelin 2019-03-06 23:55 ` Junio C Hamano 2019-03-06 13:26 ` Johannes Schindelin 2019-03-06 13:41 ` ps/stash-in-c, was " Johannes Schindelin 2019-03-06 23:56 ` Junio C Hamano 2019-03-06 18:10 ` Jonathan Tan 2019-03-07 0:19 ` 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=20190309172733.GC31533@hank.intra.tgummerer.com \ --to=t.gummerer@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=jrnieder@gmail.com \ --cc=pclouds@gmail.com \ --cc=philipoakley@iee.org \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git