From: Junio C Hamano <gitster@pobox.com>
To: David Turner <dturner@twopensource.com>
Cc: git@vger.kernel.org, sunshine@sunshineco.com, mhagger@alum.mit.edu
Subject: Re: [PATCH v4 1/5] refs: Introduce pseudoref and per-worktree ref concepts
Date: Wed, 29 Jul 2015 14:13:47 -0700 [thread overview]
Message-ID: <xmqq1tfq8y5w.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1438192688-8048-2-git-send-email-dturner@twopensource.com> (David Turner's message of "Wed, 29 Jul 2015 13:58:04 -0400")
David Turner <dturner@twopensource.com> writes:
> 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
next prev parent reply other threads:[~2015-07-29 21:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-29 17:58 [PATCH v4 0/5] pseudorefs David Turner
2015-07-29 17:58 ` [PATCH v4 1/5] refs: Introduce pseudoref and per-worktree ref concepts David Turner
2015-07-29 21:13 ` Junio C Hamano [this message]
2015-07-30 3:45 ` Johan Herland
2015-07-29 17:58 ` [PATCH v4 2/5] refs: add ref_type function David Turner
2015-07-29 17:58 ` [PATCH v4 3/5] pseudorefs: create and use pseudoref update and delete functions David Turner
2015-07-29 17:58 ` [PATCH v4 4/5] bisect: use update_ref David Turner
2015-07-29 17:58 ` [PATCH v4 5/5] sequencer: replace write_cherry_pick_head with update_ref David Turner
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq1tfq8y5w.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=sunshine@sunshineco.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.