Re: [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts

2015-07-24 Thread Junio C Hamano
David Turner writes: > I meant "and that contain a line consisting of a SHA" to exclude HEAD, > but I need to add a "always" in there, since detached HEAD would > otherwise apply. I do not think "always" is as a good escape hatch as an explicit exclusion of "HEAD". The latter is more direct and

Re: [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts

2015-07-24 Thread David Turner
On Fri, 2015-07-24 at 20:52 +0100, Philip Oakley wrote: > From: "David Turner" > > 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

Re: [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts

2015-07-24 Thread David Turner
On Fri, 2015-07-24 at 12:20 -0700, Junio C Hamano wrote: > David Turner writes: > > > +[[def_pseudoref]]pseudoref:: > > + Files under `$GIT_DIR` whose names are all-caps, and that > > + contain a line consisting of a <> followed by > > + a newline, and optionally some additional data. `MER

Re: [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts

2015-07-24 Thread Philip Oakley
From: "David Turner" 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

Re: [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts

2015-07-24 Thread Junio C Hamano
David Turner writes: > +[[def_pseudoref]]pseudoref:: > + Files under `$GIT_DIR` whose names are all-caps, and that > + contain a line consisting of a <> followed by > + a newline, and optionally some additional data. `MERGE_HEAD` > + and `CHERRY_PICK_HEAD` are examples. Unlike..

Re: [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts

2015-07-24 Thread Eric Sunshine
On Fri, Jul 24, 2015 at 12:45 AM, David Turner wrote: > 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 back

[PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts

2015-07-23 Thread David Turner
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 -