Conversation
The `git fetch` path, when parsing OIDs, properly sets `exact_oid` on the relevant refs; the equivalent path for `git fetch-pack` does not. This oversight results in an invocation of `git fetch-pack $OID` sending `want-ref $OID`, which results in errors like: fatal: unknown ref $OID fatal: remote error: unknown ref $OID Make the two paths equivalent by setting `exact_oid` properly. Signed-off-by: Nathan Froyd <[email protected]>
Welcome to GitGitGadgetHi @froydnj, 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.txtTo 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 [email protected], 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, |
|
/preview |
|
Error: User froydnj is not yet permitted to use GitGitGadget |
|
/allow |
|
User froydnj is now allowed to use GitGitGadget. |
|
/preview |
|
Preview email sent as [email protected] |
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
Junio C Hamano wrote on the Git mailing list (how to reply to this email): "Nathan Froyd via GitGitGadget" <[email protected]> writes:
> From: Nathan Froyd <[email protected]>
>
> The `git fetch` path, when parsing OIDs, properly sets `exact_oid` on
> the relevant refs; the equivalent path for `git fetch-pack` does not.
> This oversight results in an invocation of `git fetch-pack $OID`
> sending `want-ref $OID`, which results in errors like:
>
> fatal: unknown ref $OID
> fatal: remote error: unknown ref $OID
>
> Make the two paths equivalent by setting `exact_oid` properly.
>
> Signed-off-by: Nathan Froyd <[email protected]>
> ---
> builtin/fetch-pack: indicate when we have an exact oid
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2420%2Ffroydnj%2Ffroydnj-fetch-pack-exact-oid-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2420/froydnj/froydnj-fetch-pack-exact-oid-v1
> Pull-Request: https://github.com/git/git/pull/2420
>
> builtin/fetch-pack.c | 4 +-
> t/t5703-upload-pack-ref-in-want.sh | 68 ++++++++++++++++++++++++++++++
> 2 files changed, 71 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
> index 86754296fa..bef8a3dfc5 100644
> --- a/builtin/fetch-pack.c
> +++ b/builtin/fetch-pack.c
> @@ -23,13 +23,14 @@ static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
> struct ref *ref;
> struct object_id oid;
> const char *p;
> + int exact_oid = 0;
>
> if (!parse_oid_hex(name, &oid, &p)) {
> if (*p == ' ') {
> /* <oid> <ref>, find refname */
> name = p + 1;
> } else if (*p == '\0') {
> - ; /* <oid>, leave oid as name */
> + exact_oid = 1; /* <oid>, leave oid as name */
> } else {
> /* <ref>, clear cruft from oid */
> oidclr(&oid, the_repository->hash_algo);
Unlike "git fetch" that is a higher level wrapper, in "git fetch-pack",
a heuristic dwim like this is unwelcome. In
$ git fetch-pack <repository> <ref>...
these <ref> arguments are meant to be passed exactly as given.
I am not sure if there days there still is a reason to run
"fetch-pack" directly instead of "git fetch", as the manual of "git
fetch-pack" itself suggets. But if there is, then shouldn't we give
it an explicit way to say "this is not a ref but is an object name"
in a more unambiguous way. Otherwise, we lose the ability to send
"want-ref 3ce1e94f7d5607971b5de6762bbdb57e86fc5707", even if we
wanted to, which is something "git fetch" does not let you do, and
in turn may be a valid reason why somebody want to use "fetch-pack"
over "fetch" in the first place.
|
|
Junio C Hamano wrote on the Git mailing list (how to reply to this email): Junio C Hamano <[email protected]> writes:
> Unlike "git fetch" that is a higher level wrapper, in "git fetch-pack",
> a heuristic dwim like this is unwelcome. In
>
> $ git fetch-pack <repository> <ref>...
>
> these <ref> arguments are meant to be passed exactly as given.
Need a bit of clarification. I should have said
... passed to the other side on "want-ref" packet as given on
the command line. |
No description provided.