Re: [PATCH v4 1/5] refs: Introduce pseudoref and per-worktree ref concepts
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 29, 2015, 21:13 UTC
- Message-ID
- <xmqq1tfq8y5w.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1438192688-8048-2-git-send-email-dturner@twopensource.com>
David Turner <dturner@twopensource.com> writes:
Show 9 quoted lines
> 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> > ---
Will do s/refs: I/refs: i/; on the subject, and squash the following in to make the doc-toolchain happy (they are reported as missing link targets), before pushing the results out on 'pu'.
Thanks.
Documentation/glossary-content.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index ff14079..edae9f5 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -412,7 +412,7 @@ exclude;; interface than the <<def_plumbing,plumbing>>. [[def_per_worktree_ref]]per-worktree ref:: - Refs that are per-<<def_worktree,worktree>>, rather than + Refs that are per-<<def_working_tree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>>, but might later include other unusual refs. @@ -421,7 +421,7 @@ exclude;; like refs for the purposes of rev-parse, but which are treated specially by git. Psuedorefs both have names that are all-caps, and always start with a line consisting of a - <<def_sha1,SHA-1>> followed by whitespace. So, HEAD is not a + <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike