-
Notifications
You must be signed in to change notification settings - Fork 134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
documentation: add missing word "ref" #1803
base: master
Are you sure you want to change the base?
Conversation
/allow |
There are issues in commit 0db78ac: |
@mokibit please edit this comment, as it will be sent as a "cover letter". |
User mokibit is now allowed to use GitGitGadget. WARNING: mokibit has no public email address set on GitHub; |
In the git-fetch documentation, description of <refspec> syntax is not entirely clear. When explaining about "the destination ref <dst>", word "ref" is included. Logically, it should be the same in the explanation of "the source <src>". Signed-off-by: Monika Kairaityte <monika@kibit.lt>
0db78ac
to
5118290
Compare
@mokibit also, since I Welcome to GitGitGadgetHi @mokibit, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that either:
You can CC potential reviewers by adding a footer to the PR description with the following syntax:
NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description, Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel
Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):
To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
@dscho thanks! |
/preview |
Error: Could not determine full name of mokibit |
/preview |
Preview email sent as pull.1803.git.1727622037316.gitgitgadget@gmail.com |
/preview |
Preview email sent as pull.1803.git.1727622460515.gitgitgadget@gmail.com |
/preview |
Preview email sent as pull.1803.git.1727622763404.gitgitgadget@gmail.com |
/submit |
Submitted as pull.1803.git.1727623027242.gitgitgadget@gmail.com To fetch this version into
To fetch this version to local tag
|
On the Git mailing list, Junio C Hamano wrote (reply to this): "Monika Kairaitytė via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> When explaining about "the destination ref <dst>", word
> "ref" is included. Logically, it should be the same in the explanation
> of "the source <src>".
"Logically", if <src> and <dst> followed the same rules, but
otherwise, it is not a logical conclusion.
What makes me hesitate with this change is the following.
- In "+refs/heads/*:refs/remotes/origin/*", <src> is "refs/heads/*"
and <dst> is "refs/tags/*". Neither is a ref. So it could be
argued that saying "ref" before <dst> is what is wrong in the
current text, and adding "ref" before <src> makes it doubly
wrong.
- In addition, <src> can be a fully spelled object name, to fetch
just a single object. In such a case, it does not even remotely
resemble a ref.
How about this text instead? Would it solve the problem, i.e.
> In the git-fetch documentation, description of <refspec> syntax is not
> entirely clear.
Thanks.
------- >8 -------
Subject: doc: clarify <src> in refspec syntax
We explicitly avoid saying "ref <src>" when introducing the source
side of a refspec, because it can be a fully-spelled hexadecimal
object name, and it also can be a pattern that is not quite a "ref".
But we are loose when we introduce <dst> and say "ref <dst>", even
though it can also be a pattern. Let's omit "ref" also from the
destination side.
Clarify that <src> can be a ref, a (limited glob) pattern, or an
object name.
Even though the very original design of refspec expected that '*'
was used only at the end (e.g., "refs/heads/*" was expected, but not
"refs/heads/*-wip"), the code and its use evolved to handle a single
'*' anywhere in the pattern. Update the text to remove the mention
of "the same prefix". Anything that matches the pattern are named
by such a (limited glob) pattern in <src>.
Also put a bit more stress on the fact that we accept only one '*'
in the pattern by saying "one and only one `*`".
Helped-by: Monika Kairaitytė <monika@kibit.lt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/pull-fetch-param.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git c/Documentation/pull-fetch-param.txt w/Documentation/pull-fetch-param.txt
index c718f7946f..d79d2f6065 100644
--- c/Documentation/pull-fetch-param.txt
+++ w/Documentation/pull-fetch-param.txt
@@ -25,14 +25,15 @@ endif::git-pull[]
+
The format of a <refspec> parameter is an optional plus
`+`, followed by the source <src>, followed
-by a colon `:`, followed by the destination ref <dst>.
+by a colon `:`, followed by the destination <dst>.
The colon can be omitted when <dst> is empty. <src> is
-typically a ref, but it can also be a fully spelled hex object
+typically a ref, or a glob pattern with a single `*` that is used
+to match a set of refs, but it can also be a fully spelled hex object
name.
+
A <refspec> may contain a `*` in its <src> to indicate a simple pattern
match. Such a refspec functions like a glob that matches any ref with the
-same prefix. A pattern <refspec> must have a `*` in both the <src> and
+pattern. A pattern <refspec> must have one and only one `*` in both the <src> and
<dst>. It will map refs to the destination by replacing the `*` with the
contents matched from the source.
+ |
On the Git mailing list, Monika Kairaityte wrote (reply to this): Sorry for late response, it took a while to figure out replies to mailing list.
Thanks for review and suggested changes. I agree that it looks better.
Cheers,
Monika |
@mokibit could you check whether the proposed patch made it into Git, and if so, close this here PR? |
No description provided.