Web lists-archives.com

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




On 03/09, Elijah Newren wrote:
> Hi,
> 
> On Sat, Mar 9, 2019 at 9:29 AM Thomas Gummerer <t.gummerer@xxxxxxxxx> wrote:
> >
> > On 03/07, Duy Nguyen wrote:
> > > On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley <philipoakley@xxxxxxx> wrote:
> > > > 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@xxxxxxxxx>
> > ---
> >  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>>.
> 
> I think this is good, but maybe also add:
>    In contrast, no-overlay mode will also delete files not present in
> the source, similar to 'rsync --delete'
> ?

Yeah, I think that makes sense, thanks!  I'll wait a bit more to see
if there are any other comments, and then send an updated version.

> > +
> >  [[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