From: Junio C Hamano <gitster@pobox.com>
To: "ryicoh via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, ryicoh <ryicoh@gmail.com>
Subject: Re: [PATCH] doc: add that '-' is the same as '@{-1}'
Date: Fri, 31 Mar 2023 09:12:18 -0700 [thread overview]
Message-ID: <xmqqlejchpct.fsf@gitster.g> (raw)
In-Reply-To: <pull.1484.git.git.1680257503697.gitgitgadget@gmail.com> (ryicoh via GitGitGadget's message of "Fri, 31 Mar 2023 10:11:43 +0000")
"ryicoh via GitGitGadget" <gitgitgadget@gmail.com> writes:
> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
> index 9aa58052bc7..9e7ea2cf71e 100644
> --- a/Documentation/revisions.txt
> +++ b/Documentation/revisions.txt
> @@ -94,7 +94,8 @@ some output processing may assume ref names in UTF-8.
>
> '@{-<n>}', e.g. '@{-1}'::
> The construct '@{-<n>}' means the <n>th branch/commit checked out
> - before the current one.
> + before the current one. You may also specify - which is synonymous
> + to @{-1}.
I know the author of the change meant well, but this change makes
the resulting text overly broad and misleading by saying `-` is
"synonymous". It is certainly *not* synonymous in general and I
doubt we want to make it to.
$ git switch --detach master
$ git reset --hard maint
$ git commit --amend -C -
fatal: could not look up commit -
$ git show -
fatal: unrecognized argument: -
$ git log ..-
fatal: ambiguous argument '..-': unknown revision or path not in the working tree
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file...]'
$ git log HEAD..- --
fatal: bad revision 'HEAD..-'
There are only few selected places that treat "-" like "@{-1}". The
primary motivation behind "-" is to allow those who are so used to
see that "cd $there && do something there && cd -" to come back to
the original place to do
$ git switch there
$ hack hack hack
$ git switch - ;# or "git checkout -"
and the intention is to use it where we do not allow arbitrary
commit object name but it is clear we are taking a branch name.
"git switch --help" and "git checkout --help" already mention them;
if there is another command that uses "-" as "@{-1}" (and not as
"the standard input" or "the standard output"), for now we should
update its documentation to mention "- can also be used in place of
@{-1}".
Thanks.
next prev parent reply other threads:[~2023-03-31 16:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-31 10:11 [PATCH] doc: add that '-' is the same as '@{-1}' ryicoh via GitGitGadget
2023-03-31 12:03 ` Oswald Buddenhagen
2023-03-31 16:12 ` Junio C Hamano [this message]
2023-04-01 15:53 ` ryicoh
2023-04-02 12:26 ` Junio C Hamano
2023-03-31 16:29 ` Phillip Wood
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=xmqqlejchpct.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=ryicoh@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.
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).