Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-20 Thread Ramkumar Ramachandra
Richard Hansen wrote: > * Aren't HEAD, FETCH_HEAD, ORIG_HEAD also refs? HEAD is a symbolic ref [*1*], FETCH_HEAD is not a ref [*2*], and ORIG_HEAD is a ref. > ref > A binding of a name to an object or other ref (in which case it > is a symref). Refs are stored in the reposi

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-20 Thread Ramkumar Ramachandra
Richard Hansen wrote: > In the meantime, I'll > rework the patch series to avoid using the word "ref" when defining > committish and tree-ish. This is a good way forward. I'm curious about what you're planning on substituting it with though: the "extended SHA-1 expression" that Jonathan hinted at

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Junio C Hamano
Richard Hansen writes: > On 2013-06-19 18:36, Junio C Hamano wrote: >> Ahh. If you had quoted [...] a few exchanges ago I would have >> immediately understood what you were trying to say. > > Sorry about that, my bad. > >> In today's world (after packed-refs was introduced), probably >> >>

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Richard Hansen
On 2013-06-19 18:36, Junio C Hamano wrote: > Ahh. If you had quoted [...] a few exchanges ago I would have > immediately understood what you were trying to say. Sorry about that, my bad. > In today's world (after packed-refs was introduced), probably > > A name that begins with refs/ (e.g

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Junio C Hamano
Richard Hansen writes: > Here's what I'm trying to say: > > * Given the current definition of "ref" in gitglossary(7), claiming > that a foo-ish is a ref is not entirely incorrect. Ahh. If you had quoted this a few exchanges ago: [[def_ref]]ref:: A 40-byte hex representat

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Richard Hansen
On 2013-06-19 17:05, Junio C Hamano wrote: > Richard Hansen writes: > >> On 2013-06-19 13:14, Junio C Hamano wrote: >>> -ish does not have anything to do with a ref. Even >>> when an object is dangling in your object store without being >>> reachable from any of your refs, it keeps its own "ish"

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Junio C Hamano
Richard Hansen writes: > On 2013-06-19 13:14, Junio C Hamano wrote: >> -ish does not have anything to do with a ref. Even >> when an object is dangling in your object store without being >> reachable from any of your refs, it keeps its own "ish"-ness. > > Ah, so your personal definition of "ref"

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Richard Hansen
On 2013-06-19 13:14, Junio C Hamano wrote: > -ish does not have anything to do with a ref. Even > when an object is dangling in your object store without being > reachable from any of your refs, it keeps its own "ish"-ness. Ah, so your personal definition of "ref" matches my personal definition o

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Junio C Hamano
Richard Hansen writes: > Signed-off-by: Richard Hansen > --- > Documentation/glossary-content.txt | 11 +++ > 1 file changed, 11 insertions(+) > > diff --git a/Documentation/glossary-content.txt > b/Documentation/glossary-content.txt > index 01365d9..a3cc003 100644 > --- a/Documentatio

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Richard Hansen
On 2013-06-19 11:31, Richard Hansen wrote: > On 2013-06-19 01:56, Ramkumar Ramachandra wrote: >> From gitglossary(7): >> >> ref >> A 40-byte hex representation of a SHA-1 or a name that denotes a >> particular object. They may be stored in a file under $GIT_DIR/refs/ >> directory, or in

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-19 Thread Richard Hansen
On 2013-06-19 01:56, Ramkumar Ramachandra wrote: > From gitglossary(7): > > ref > A 40-byte hex representation of a SHA-1 or a name that denotes a > particular object. They may be stored in a file under $GIT_DIR/refs/ > directory, or in the $GIT_DIR/packed-refs file. > > Do master~3 a

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-18 Thread Jonathan Nieder
Hi, Richard Hansen wrote: > --- a/Documentation/glossary-content.txt > +++ b/Documentation/glossary-content.txt > @@ -82,6 +82,17 @@ to point at the new commit. > to the top <> of the stored > revision. > > +[[def_committish]]committish (also commit-ish):: > + A <> pointing to a

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-18 Thread Ramkumar Ramachandra
Richard Hansen wrote: > On 2013-06-19 00:19, Ramkumar Ramachandra wrote: >> Is master~3 a committish? What about :/foomery? > > Yes; as documented, both of those are refs that point to a commit. >From gitglossary(7): ref A 40-byte hex representation of a SHA-1 or a name that denotes a pa

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-18 Thread Richard Hansen
On 2013-06-19 00:19, Ramkumar Ramachandra wrote: > Is master~3 a committish? What about :/foomery? Yes; as documented, both of those are refs that point to a commit. > Look at the other forms in gitrevisions(7); master:quuxery, > master^{tree} are notable exceptions. gitrevisions(7) says that m

Re: [PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-18 Thread Ramkumar Ramachandra
Richard Hansen wrote: > +[[def_committish]]committish (also commit-ish):: Good. > + A <> pointing to an <> that > + can be recursively dereferenced to a > + <>. > + The following are all committishes: > + a ref pointing to a commit object, > + a ref pointing to

[PATCH 2/4] glossary: define committish (a.k.a. commit-ish)

2013-06-18 Thread Richard Hansen
Signed-off-by: Richard Hansen --- Documentation/glossary-content.txt | 11 +++ 1 file changed, 11 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 01365d9..a3cc003 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation