From: Denton Liu <liu.denton@gmail.com>
To: Andreas Heiduk <asheiduk@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Duy Nguyen <pclouds@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 0/3] cleanup revisions.txt
Date: Fri, 3 May 2019 04:13:54 -0400 [thread overview]
Message-ID: <20190503081354.GA23442@archbookpro.localdomain> (raw)
In-Reply-To: <7e9ab65d-aee9-b900-c294-8810e0109721@gmail.com>
Hi Andreas,
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?
Will do.
Thanks,
Denton
>
> ----------------- 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@gmail.com>
> ---
> 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
> --
> 2.21.0
prev parent reply other threads:[~2019-05-03 8:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 6:12 [PATCH] revisions.txt: mention <rev>~ form Denton Liu
2019-04-22 6:32 ` Junio C Hamano
2019-04-22 7:39 ` Denton Liu
2019-04-22 11:21 ` Junio C Hamano
2019-04-22 9:59 ` Duy Nguyen
2019-04-24 1:05 ` Junio C Hamano
2019-04-26 20:55 ` Andreas Heiduk
2019-04-26 21:16 ` Denton Liu
2019-04-27 12:15 ` [PATCH v2 0/3] cleanup revisions.txt Denton Liu
2019-04-27 12:15 ` [PATCH v2 1/3] revisions.txt: change "rev" to "<rev>" Denton Liu
2019-04-27 12:16 ` [PATCH v2 2/3] revisions.txt: mark optional rev arguments with [] Denton Liu
2019-05-03 7:17 ` Andreas Heiduk
2019-05-03 7:35 ` Andreas Heiduk
2019-04-27 12:16 ` [PATCH v2 3/3] revisions.txt: mention <rev>~ form Denton Liu
2019-05-03 8:01 ` [PATCH v2 0/3] cleanup revisions.txt Andreas Heiduk
2019-05-03 8:13 ` Denton Liu [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190503081354.GA23442@archbookpro.localdomain \
--to=liu.denton@gmail.com \
--cc=asheiduk@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).