From: Junio C Hamano <hidden> Date: 2021-05-18 11:17:52
Sometimes new people are confused by how a revision "range" works,
in that it is not a random collection of commits but a set of
commits that are all connected to each other, and most Git commands
work on a single such "range".
Give an example to clarify it.
Signed-off-by: Junio C Hamano <redacted>
---
* So, here it is in a proper patch form, with an extended
description and illustration.
Documentation/revisions.txt | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
@@ -260,6 +260,9 @@ any of the given commits. A commit's reachable set is the commit itself and the commits in its ancestry chain.+There are several notations to specify a set of connected commits+(called a "revision range"), illustrated below.+ Commit Exclusions ~~~~~~~~~~~~~~~~~
@@ -294,6 +297,26 @@ is a shorthand for 'HEAD..origin' and asks "What did the origin do since I forked from them?" Note that '..' would mean 'HEAD..HEAD' which is an empty range that is both reachable and unreachable from HEAD.+Commands that are specifically designed to take two distinct ranges+(e.g. "git range-diff R1 R2" to compare two ranges) do exist, but+they are exceptions. Unless otherwise noted, all "git" commands+that operate on a set of commits work on a single revision range.+In other words, writing two "two-dot range notation" next to each+other, e.g.++ $ git log A..B C..D++does *not* specify two revision ranges for most commands. Instead+it will name a single connected set of commits, i.e. those that are+reachable from either B or D but are reachable from neither A or C.+In a linear history like this:++ ---A---B---o---o---C---D++because A and B are reachable from C, the revision range specified+by these two dotted ranges is a single commit D.++ Other <rev>{caret} Parent Shorthand Notations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Three other shorthands exist, particularly useful for merge commits,
+Commands that are specifically designed to take two distinct ranges
+(e.g. "git range-diff R1 R2" to compare two ranges) do exist, but
+they are exceptions. Unless otherwise noted, all "git" commands
+that operate on a set of commits work on a single revision range.
+In other words, writing two "two-dot range notation" next to each
+other, e.g.
+
+ $ git log A..B C..D
+
+does *not* specify two revision ranges for most commands. Instead
+it will name a single connected set of commits, i.e. those that are
+reachable from either B or D but are reachable from neither A or C.
+In a linear history like this:
+
+ ---A---B---o---o---C---D
+
So "git log A..B C..D" is same as "A..D", right?
--
An old man doll... just what I always wanted! - Clara
On Wed, May 19, 2021 at 7:28 PM Bagas Sanjaya [off-list ref] wrote:
On 18/05/21 18.17, Junio C Hamano wrote:
quoted
+Commands that are specifically designed to take two distinct ranges
+(e.g. "git range-diff R1 R2" to compare two ranges) do exist, but
+they are exceptions. Unless otherwise noted, all "git" commands
+that operate on a set of commits work on a single revision range.
+In other words, writing two "two-dot range notation" next to each
+other, e.g.
+
+ $ git log A..B C..D
+
+does *not* specify two revision ranges for most commands. Instead
+it will name a single connected set of commits, i.e. those that are
+reachable from either B or D but are reachable from neither A or C.
+In a linear history like this:
+
+ ---A---B---o---o---C---D
+
Why did you snip off the immediate next part of Junio's text which said:
+because A and B are reachable from C, the revision range specified
+by these two dotted ranges is a single commit D.
Is this sentence hard to parse or confusing in some way? I thought
this sentence would have made it pretty clear that the answer to this
question:
So "git log A..B C..D" is same as "A..D", right?
was 'no', so I'm curious if that particular final sentence's wording
could be improved.
From: Felipe Contreras <hidden> Date: 2021-05-21 19:19:25
Junio C Hamano wrote:
+Commands that are specifically designed to take two distinct ranges
+(e.g. "git range-diff R1 R2" to compare two ranges) do exist, but
+they are exceptions. Unless otherwise noted, all "git" commands
Not sure why "git" is in quotes.
+that operate on a set of commits work on a single revision range.
+In other words, writing two "two-dot range notation" next to each
+other, e.g.
+
+ $ git log A..B C..D
+
+does *not* specify two revision ranges for most commands. Instead
+it will name a single connected set of commits, i.e. those that are
+reachable from either B or D but are reachable from neither A or C.
+In a linear history like this:
+
+ ---A---B---o---o---C---D
+
+because A and B are reachable from C, the revision range specified
+by these two dotted ranges is a single commit D.
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 8 commits. Instead the
starting point A gets overriden by B, and the ending point of E by F,
effectively becoming B..F.
With more complex graphs the result is not so simple and might result
in two disconnected sets of commits, but that is considered a single
revision range.
--
Felipe Contreras