Re: [PATCH v2 0/3] cleanup revisions.txt
- Date: Fri, 3 May 2019 04:13:54 -0400
- From: Denton Liu <liu.denton@xxxxxxxxx>
- Subject: Re: [PATCH v2 0/3] cleanup revisions.txt
Thanks for the earlier corrections on 2/3.
On Fri, May 03, 2019 at 10:01:08AM +0200, Andreas Heiduk wrote:
> Am 27.04.19 um 14:15 schrieb Denton Liu:
> While reading/reviewing I stumbled across another case for marking optional
> clauses. But the solutions is not a one-liner. @Denton Would you please add
> that one as Patch 4/4 to your series?
> ----------------- 8< ----------------------------
> Subject: [PATCH] revisions.txt: remove ambibuity between <rev>:<path> and :<path>
> The revision ':README' is mentioned as an example for '<rev>:<path>'
> but the explanation forwards to the ':<n>:<path>' syntax. At the same
> time ':<n>:<path>' did not mark the '<n>:' as optional.
> Signed-off-by: Andreas Heiduk <asheiduk@xxxxxxxxx>
> Documentation/revisions.txt | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
> index 372b286755..f11d1edc57 100644
> --- a/Documentation/revisions.txt
> +++ b/Documentation/revisions.txt
> @@ -196,19 +196,16 @@ existing tag object.
> Depending on the given text, the shell's word splitting rules might
> require additional quoting.
> -'<rev>:<path>', e.g. 'HEAD:README', ':README', 'master:./README'::
> +'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'::
> A suffix ':' followed by a path names the blob or tree
> at the given path in the tree-ish object named by the part
> before the colon.
> - ':path' (with an empty part before the colon)
> - is a special case of the syntax described next: content
> - recorded in the index at the given path.
> A path starting with './' or '../' is relative to the current working directory.
> The given path will be converted to be relative to the working tree's root directory.
> This is most useful to address a blob or tree from a commit or tree that has
> the same tree structure as the working tree.
> -':<n>:<path>', e.g. ':0:README', ':README'::
> +':[<n>:]<path>', e.g. ':0:README', ':README'::
> A colon, optionally followed by a stage number (0 to 3) and a
> colon, followed by a path, names a blob object in the
> index at the given path. A missing stage number (and the colon