From: Felipe Contreras <felipe.contreras@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Bagas Sanjaya <bagasdotme@gmail.com>,
Elijah Newren <newren@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] doc: revisions: improve single range explanation
Date: Sat, 12 Jun 2021 23:25:56 -0500 [thread overview]
Message-ID: <60c588d452750_3d86c2085c@natae.notmuch> (raw)
In-Reply-To: <CAPig+cSE2h7A52drhELfZJLDEgQ1z+nEXoXhYMUSA00Z+S=OUA@mail.gmail.com>
Eric Sunshine wrote:
> On Sat, Jun 12, 2021 at 8:44 PM Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
> > The original explanation didn't seem clear enough to some people.
> >
> > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> > ---
> > diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
> > @@ -299,22 +299,22 @@ empty range that is both reachable and unreachable from HEAD.
> > +For example, if you have a linear history like this:
> >
> > + ---A---B---C---D---E---F
> >
> > +Doing A..F will retrieve 5 commits, and doing B..E will retrieve 3
> > +commits, but doing A..F B..E will not retrieve two revision ranges
> > +totalling 8 commits. Instead the starting point A gets overriden by B,
> > +and the ending point of E by F, effectively becoming B..F, a single
> > +revision range.
>
> s/overriden/overridden/
>
> For what it's worth, as a person who is far from expert at revision
> ranges, I had to read this revised text five or six times and think
> about it quite a bit to understand what it is saying,
Can you explain why?
This is the context: commands don't generally take two ranges:
1. Unless otherwise noted, all git commands that operate on a set of
commits work on a single revision range.
2. Doing A..F will retrieve 5 commits, and doing B..E will retrieve 3
commits, but doing A..F B..E will not retrieve two revision ranges
totalling 8 commits.
At this point what isn't clear? Isn't it clear that `A..F B..E` aren't
two revision ranges?
3. Instead the starting point A gets overridden by B, and the ending
point of E by F, effectively becoming B..F, a single revision range.
What isn't clear about that? A gets superseded by B because it's higher
in the graph. And if you do `git log D E F` it's clear that doing
`git log F` will get you the same thing, isn't it?
> Also, if this explanation is aimed at newcomers, then saying only
> "doing A..F will retrieve 5 commits" without actually saying _which_
> commits those are is perhaps not so helpful.
It doesn't matter which specific commits are retrieved, the only thing
that matters is that `X op Y` is not additive.
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-13 4:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 0:44 [PATCH] doc: revisions: improve single range explanation Felipe Contreras
2021-06-13 2:50 ` Bagas Sanjaya
2021-06-13 3:12 ` Felipe Contreras
2021-06-13 3:32 ` Eric Sunshine
2021-06-13 4:25 ` Felipe Contreras [this message]
2021-06-13 7:02 ` Elijah Newren
2021-06-13 17:09 ` Felipe Contreras
2021-06-14 14:39 ` Elijah Newren
2021-06-15 11:53 ` Felipe Contreras
2021-06-13 8:11 ` Eric Sunshine
2021-06-13 16:13 ` Felipe Contreras
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=60c588d452750_3d86c2085c@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).