Re: [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts
- From
David Turner <dturner@twopensource.com>
- Date
- Jul 24, 2015, 20:14 UTC
- Message-ID
- <1437768881.1141.15.camel@twopensource.com>
- In-Reply-To
- <344748CA1CA54D55A9F245FE2DBD23DC@PhilipOakley>
On Fri, 2015-07-24 at 20:52 +0100, Philip Oakley wrote:
Show 29 quoted lines
> From: "David Turner" <dturner@twopensource.com> > > Add glossary entries for both concepts. > > > > Pseudorefs and per-worktree refs do not yet have special handling, > > because the files refs backend already handles them correctly. Later, > > we will make the LMDB backend call out to the files backend to handle > > per-worktree refs. > > > > Signed-off-by: David Turner <dturner@twopensource.com> > > --- > > Documentation/glossary-content.txt | 17 +++++++++++++++++ > > refs.c | 23 +++++++++++++++++++++++ > > refs.h | 2 ++ > > 3 files changed, 42 insertions(+) > > > > diff --git a/Documentation/glossary-content.txt > > b/Documentation/glossary-content.txt > > index ab18f4b..d04819e 100644 > > --- a/Documentation/glossary-content.txt > > +++ b/Documentation/glossary-content.txt > > @@ -411,6 +411,23 @@ exclude;; > > core Git. Porcelains expose more of a <<def_SCM,SCM>> > > interface than the <<def_plumbing,plumbing>>. > > > > +[[def_per_worktree_ref]]per-worktree ref:: > > + Refs that are per-<<def_worktree,worktree>>, rather than > > + global. This is presently only <<def_HEAD,HEAD>>, but might > > + later include other unsuual refs. > s/unsuual/unusual/
Thanks.
Show 9 quoted lines
> > + > > +[[def_pseudoref]]pseudoref:: > > + Files under `$GIT_DIR` whose names are all-caps, and that > > s/and that/excluding 'HEAD', which is special./ ? > > > + contain a line consisting of a <<def_sha1,SHA-1>> followed by > > s/contain/Pseudorefs typically contain/ perhaps?
See my reply to Junio on these; that "contain a line" thing was intended to be an additional condition on what constitutes a pseudoref.